-
Notifications
You must be signed in to change notification settings - Fork 58
Fix loading missing files post deployment #246
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
52149106D34A73BB8DE3CD83918A1272E980EFE1FADFFC8A80002F96E76429866F7DEB68D99456C71E4D01E85F89D936C6805BD7E40CB772580DCF30BB27A1EB | ||
AEFC6C5B33B8A0A3AEB075A6C8E2DFEA5D0B1AE302014601999F45C6F5C68A5AA2D50F490F472BC05932163737CEBDFA4EEE066D006415E7BF8C5FD7E3F6FEA9 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,6 +58,7 @@ | |
$ingestTimeout ??= 10; | ||
/** @var ?string $server */ | ||
$server ??= (string) gethostname(); | ||
$testing = (bool) ($_SERVER['NIGHTWATCH_TESTING'] ?? false); | ||
|
||
/* | ||
* Logging helpers... | ||
|
@@ -84,7 +85,11 @@ | |
if ($expectedSignature === false) { | ||
$error("Unable to read the agent's signature"); | ||
|
||
return; | ||
if ($testing) { | ||
return; | ||
} else { | ||
exit(1); | ||
} | ||
Comment on lines
+88
to
+92
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Previously, this would just return, but I think we should exit with an error code if we cannot read the signature file. |
||
} | ||
|
||
$tokenHash = substr(hash('xxh128', $refreshToken), 0, 7); | ||
|
@@ -196,3 +201,16 @@ | |
$checkSignature->start(); | ||
|
||
$loop->run(); | ||
|
||
if (! $testing) { | ||
// When the agent is invoked from the artisan command, it is possible that | ||
// the Laravel application will attempt to load additional PHP files after | ||
// the agent has shut down. These additional PHP files are part of their | ||
// application not one of the agent's dependencies. If the application is | ||
// using a symlink switch deployment strategy, e.g., Laravel Envoyer, it is | ||
// possible the additional files are no longer present, which will trigger | ||
// a fatal PHP error. Exiting here ensures that the agent always shuts down | ||
// cleanly with the tradeoff that the application's terminating hooks will | ||
// not run for the `nightwatch:agent` command. | ||
exit(0); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I need to be able to avoid
exit
while we are running the testsuite.