sappho-heatmiser-proxy 0.0.3 → 0.0.4

data/lib/sappho-heatmiser-proxy.rb

@@ -11,13 +11,14 @@ module Sappho
       require 'sappho-heatmiser-proxy/heatmiser_client'
       require 'sappho-heatmiser-proxy/client_register'
       require 'sappho-heatmiser-proxy/trace_log'
+      require 'sappho-heatmiser-proxy/version'
       require 'thread'
       require 'socket'
 
       class CommandLine
 
         def CommandLine.process
-          Thread.abort_on_exception = true
+          TraceLog.instance.info "#{NAME} version #{VERSION} - #{HOMEPAGE}"
           Thread.new do
             clients = ClientRegister.instance
             port = Integer SystemConfiguration.instance.config['heatmiser.port']
@@ -37,7 +38,9 @@ module Sappho
               end
             end
           end
-          Thread.new{Heatmiser.new.monitor}.join
+          Thread.new do
+            Heatmiser.new.monitor
+          end.join
         end
 
       end

data/lib/sappho-heatmiser-proxy/trace_log.rb

@@ -10,8 +10,6 @@ module Sappho
       require 'singleton'
       require 'thread'
       require 'logger'
-      require 'sappho-heatmiser-proxy/system_configuration'
-      require 'sappho-heatmiser-proxy/version'
 
       class TraceLog
 
@@ -19,21 +17,21 @@ module Sappho
 
         def initialize
           @mutex = Mutex.new
-          $stdout.sync = true
           @log = Logger.new $stdout
-          @log.level = SystemConfiguration.instance.config['log.debug'] ? Logger::DEBUG : Logger::INFO
-          @log.info "#{NAME} version #{VERSION} - #{HOMEPAGE}"
+          @log.level = ENV['heatmiser.log.level'] == 'debug' ? Logger::DEBUG : Logger::INFO
         end
 
         def info message
           @mutex.synchronize do
             @log.info message
+            $stdout.flush
           end if @log.info?
         end
 
         def debug message
           @mutex.synchronize do
             @log.debug message
+            $stdout.flush
           end if @log.debug?
         end
 
@@ -41,6 +39,7 @@ module Sappho
           @mutex.synchronize do
             @log.error "error! #{error.message}"
             error.backtrace.each { |error| @log.error error }
+            $stdout.flush
           end if @log.error?
         end
 

data/lib/sappho-heatmiser-proxy/version.rb

@@ -7,7 +7,7 @@ module Sappho
   module Heatmiser
     module Proxy
       NAME = "sappho-heatmiser-proxy"
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
       AUTHORS = ["Andrew Heald"]
       EMAILS = ["andrew@heald.co.uk"]
       HOMEPAGE = "https://github.com/sappho/sappho-heatmiser-proxy/wiki"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-heatmiser-proxy
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Andrew Heald