From aa03a86b5f609ef9775e43d7d8df664cee35b57f Mon Sep 17 00:00:00 2001 From: David Genord II Date: Fri, 10 Mar 2023 16:37:11 -0500 Subject: [PATCH] Standard fixes --- pi/Gemfile | 2 +- pi/listener.rb | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pi/Gemfile b/pi/Gemfile index 5968455..e953baa 100644 --- a/pi/Gemfile +++ b/pi/Gemfile @@ -3,4 +3,4 @@ ruby "3.2.1" gem "action_cable_client" gem "json" -gem "sd_notify" \ No newline at end of file +gem "sd_notify" diff --git a/pi/listener.rb b/pi/listener.rb index d55545c..80b9bb9 100755 --- a/pi/listener.rb +++ b/pi/listener.rb @@ -5,13 +5,11 @@ require "action_cable_client" require "sd_notify" -$running = true - if ENV["NOTIFY_SOCKET"] - STDOUT.reopen "listener.log", "a" - STDERR.reopen "listener.log", "a" - STDOUT.sync = true - STDERR.sync = true + $stdout.reopen "listener.log", "a" + $stderr.reopen "listener.log", "a" + $stdout.sync = true + $stderr.sync = true end class StopLight @@ -25,6 +23,7 @@ class StopLight @yellow = true @green = true @blink_state = true + @running = true def self.startup export_pin(RED_LED) @@ -104,7 +103,7 @@ def self.start_client EventMachine.run do client = ActionCableClient.new("wss://#{HOST}/cable", params, true, headers) client.connected { puts "[#{Time.now}] successfully connected." } - client.received do | message | + client.received do |message| puts "[#{Time.now}] #{message["message"]["colors"]}" set_colors(message["message"]["colors"]) end @@ -122,12 +121,12 @@ def self.trap_signals def self.shutdown SdNotify.stopping - $running = false + @running = false exit end def self.restart - return unless $running + return unless @running puts "[#{Time.now}] restarting" SdNotify.reloading