Skip to content

Commit

Permalink
Fix bug introduced in 1.2.22 where the lock file would not be released.
Browse files Browse the repository at this point in the history
  • Loading branch information
sudoremo committed Aug 26, 2024
1 parent c2ed2fa commit f546aa9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
# Workhorse Changelog

## 1.2.23 - 2024-08-26

* Fix bug introduced in 1.2.22 where the lock file would not be released. This
is done by reverting the changes for `at_exit` handlers. Make sure the Gem
'debug' is not loaded (e.g. via `gem 'debug', environment: :development`) for
workhorse processes.

Sitrox reference: #128709.

## 1.2.22 - 2024-08-20

* Change `retry-on` in actions to `any`: also retry when the action hits a timeout

* Comply with RuboCop

* Skip `at_exit` handlers when exiting in ShellHandler
* Skip `at_exit` handlers when exiting in ShellHandler. This ensures
compatibility with the `debug` gem, which whould otherwise hang when using the
Workhorse shell handler.

Sitrox reference: #128333.

Expand Down
16 changes: 8 additions & 8 deletions lib/workhorse/daemon/shell_handler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ def self.run(**options, &block)
begin
case ARGV.first
when 'start'
exit! daemon.start
exit daemon.start
when 'stop'
exit! daemon.stop
exit daemon.stop
when 'kill'
exit! daemon.stop(true)
exit daemon.stop(true)
when 'status'
exit! daemon.status
exit daemon.status
when 'watch'
exit! daemon.watch
exit daemon.watch
when 'restart'
exit! daemon.restart
exit daemon.restart
when 'restart-logging'
exit! daemon.restart_logging
exit daemon.restart_logging
when 'usage'
usage
exit! 99
exit 99
else
usage
end
Expand Down

0 comments on commit f546aa9

Please sign in to comment.