adminix 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a37299c44d032386ade1950f6523bb6ded0e8365
-  data.tar.gz: 76f9af22934ea38984b07c86153e7e903e95653a
+  metadata.gz: 45e38f6ab291533bc9d2ddfea1b40d395a9c2a38
+  data.tar.gz: d9aab6442d891b7941e79425a0176e2c92c1379b
 SHA512:
-  metadata.gz: 852c9f5871d90734dc4789bd8c3d96a647650a9ca16721eed4cd5976ddf6899bb9a0b7b5cab14c551a5100888af40b8e5cb9879d8b1588d00b658f8b783faa99
-  data.tar.gz: 6044c8ab1faab8b55ac4b98549103aaff6e0ea68565eb6f36b45cbac12d0ec350a81ef46e676e0af94131604f968667c9114823f74ee89c77ea8a7d2c0b8e223
+  metadata.gz: fc6c55db0afc0caa75a98445f753bcd2dd8c4b9d595002be195881144e7500e0b0740f72620da36841e460ea229ea6ac3db25c6164c648fc4d37c250358b0ca8
+  data.tar.gz: a319109ccdb06cec1340738c53ba5b5e6031ff2ad840073ab2142dab97be9abe037f91f561e8278cf77da6783f661685675e8f6030a0da02f40cb03a7a4073e4

data/lib/adminix/config.rb

@@ -9,7 +9,7 @@ module Adminix
     DEFAULT_WEBSOCKET_HOST = 'wss://api.adminix.io/websocket'.freeze
     DEFAULT_SETUP_SERVER_PORT = '8080'
 
-    attr_accessor :service_id, :secret_key, :host, :commands, :daemon, :setup_server_port, :scripts, :watch_log_files, :watcher_sync_period, :logs_sync_period, :websocket_path, :mode
+    attr_accessor :service_id, :secret_key, :host, :commands, :daemon, :setup_server_port, :scripts, :watch_log_files, :watcher_sync_period, :logs_sync_period, :websocket_path, :mode, :working_dir
 
     def initialize
       @host = ENV['ADMINIX_HOST'] || DEFAULT_HOST
@@ -19,6 +19,7 @@ module Adminix
       @logs_sync_period = 3
       @websocket_path = ENV['ADMINIX_WEBSOCKET_HOST'] || DEFAULT_WEBSOCKET_HOST
       @mode = 'classic'
+      @working_dir = `pwd`.split("\n").first
       @scripts = {
         watcher_start: 'sudo systemctl start adminix.service',
         watcher_stop: 'sudo systemctl stop adminix.service',
@@ -48,6 +49,7 @@ module Adminix
         data = JSON.parse(content) rescue {}
 
         @mode = data['mode'] || 'classic'
+        @working_dir = data['working_dir'] if data['working_dir']
 
         scripts = data['scripts'] || {}
         @scripts = {

data/lib/adminix/service.rb

@@ -114,7 +114,7 @@ module Adminix
       system.log "Stopping process"
       case config.mode
       when 'classic'
-        system.eval("#{config.scripts[:watcher_stop]} && #{config.scripts[:watcher_start]}")
+        system.eval("#{config.scripts[:process_stop]} && #{config.scripts[:process_start]}")
       when 'docker'
         Process.kill('INT', 1) rescue nil
       end
@@ -131,7 +131,7 @@ module Adminix
     end
 
     def file_lines_number(file_path)
-      `wc -l #{file_path}`.to_i
+      File.exists?(file_path) ? `wc -l #{file_path}`.to_i : 0
     end
 
     def execute_command(key, process_id, args)
@@ -142,7 +142,7 @@ module Adminix
       args.each { |hs| script.gsub!("%{#{hs[0]}}", hs[1]) }
 
       export_envs = options_to_envs_inline
-      script = "#{export_envs} && #{script}"
+      script = "cd #{config.working_dir} && #{export_envs} && #{script}"
 
       system.log "Executing command: "
       system.log "-----------------------------------"

data/lib/adminix/version.rb

@@ -1,3 +1,3 @@
 module Adminix
-  VERSION = "0.1.26"
+  VERSION = "0.1.27"
 end

data/lib/adminix/watcher.rb

@@ -77,7 +77,10 @@ module Adminix
 
         # Logs watcher
         config.watch_log_files.each do |file_path|
-          EventMachine.watch_file(file_path, Adminix::LogWatchHandler)
+          File.write(file_path, '') unless File.exists?(file_path)
+          if File.exists?(file_path)
+            EventMachine.watch_file(file_path, Adminix::LogWatchHandler)
+          end
         end
 
         EventMachine.add_periodic_timer(config.logs_sync_period) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminix
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Christian Dyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine