Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Debugger: Windows compatibility #894

Merged
merged 8 commits into from
Feb 10, 2018
Merged

Debugger: Windows compatibility #894

merged 8 commits into from
Feb 10, 2018

Conversation

chingor13
Copy link
Contributor

@chingor13 chingor13 commented Feb 9, 2018 •
edited
Loading

  • Updates README with how to install on windows vs. unix
  • Agent will only try to start the Daemon via the unified batch/async daemon if batch daemon is running and sysv is available.
  • Puts google-cloud-debugger bin script back
    • Adds more command line options for specifying a config script
    • Does not start the daemon if the batch daemon is running and sysv is available (it will be started by the Agent - inverse of the above scenario).

@chingor13
Re-introduce the google-cloud-debugger binary script.
1ecf616 
The script is required in order to run on systems without sysv
extensions. If the system cannot run sysv extensions, then the Agent
will not attempt to register the Daemon with the BatchRunner.
@chingor13
put the binary back in the composer.json files
72ed016
@chingor13
Fix missing use
400f5d4
@chingor13
Update README with installation instructions for windows
5c9c405
@chingor13 chingor13 requested a review from tmatsuo as a code owner February 9, 2018 22:12
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Feb 9, 2018
chingor13
chingor13 commented Feb 9, 2018
View reviewed changes
src/Debugger/bin/google-cloud-debugger Outdated
showUsageAndDie();
}
} else {
$sourceRoot = $options['s'] ?: $options['source-root'] ?: $argv[1];

This comment was marked as spam.

Sign in to view

tmatsuo
tmatsuo approved these changes Feb 9, 2018
View reviewed changes
src/Debugger/bin/google-cloud-debugger Outdated
if ($config) {
if (file_exists($config)) {
$daemon = require_once $config;
var_dump($daemon);

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

tmatsuo
tmatsuo suggested changes Feb 9, 2018
View reviewed changes
Copy link
Contributor

@tmatsuo tmatsuo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, just undo the approval

@chingor13 chingor13 changed the title WIP: Debugger: Windows compatibility Debugger: Windows compatibility Feb 9, 2018
@chingor13
Copy link
Contributor Author

@tmatsuo This is now ready for a look. Moved much of the logic from the google-cloud-debugger script into a class with a tests for invalid conditions.

Confirmed that if you configure a GAE flex app with the additional supervisord config that runs the google-cloud-debugger script that it correctly does not start with an error message. The daemon is instead started by the agent on the first request.

@chingor13 chingor13 merged commit 60a5d0e into googleapis:master Feb 10, 2018
@chingor13 chingor13 deleted the windows-debugger branch February 10, 2018 00:30
@jdpedrie jdpedrie mentioned this pull request Feb 15, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmatsuo tmatsuo tmatsuo approved these changes

Assignees
No one assigned
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chingor13 @tmatsuo @googlebot