adminix 0.1.27 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45e38f6ab291533bc9d2ddfea1b40d395a9c2a38
-  data.tar.gz: d9aab6442d891b7941e79425a0176e2c92c1379b
+  metadata.gz: 650f37981b425876a29f92836c4bd6a77e95ccc6
+  data.tar.gz: bef0c035fcd673ac2d8e81966fbbec7d3d88d47f
 SHA512:
-  metadata.gz: fc6c55db0afc0caa75a98445f753bcd2dd8c4b9d595002be195881144e7500e0b0740f72620da36841e460ea229ea6ac3db25c6164c648fc4d37c250358b0ca8
-  data.tar.gz: a319109ccdb06cec1340738c53ba5b5e6031ff2ad840073ab2142dab97be9abe037f91f561e8278cf77da6783f661685675e8f6030a0da02f40cb03a7a4073e4
+  metadata.gz: 70fe0ca6aa0d996b306a464321ec61e25000b90a43199e5998dbf35e16d9cae48afa3850e958315127365254f38a2489c0c1f1e5f35cff08546777635d3f7e44
+  data.tar.gz: 52bc0612a38dd38ebdaf1d71158dd6034f19caafb6aee2900146e3efff549753b133756627d29fabf4fd46becbe451fb1c39029f0fabc4c3520c19c8509995b6

data/adminix.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "eventmachine", "1.2.3"
-  spec.add_dependency "action_cable_client", "2.0.0"
+  spec.add_dependency "eventmachine", "1.2.5"
+  spec.add_dependency "action_cable_client", "2.0.2"
   spec.add_dependency "sinatra", "1.4.8"
 
   spec.add_development_dependency "bundler", "~> 1.14"

data/exe/adminix

@@ -49,6 +49,7 @@ unless options[:action] == "help"
   config.service_id = options[:service_id]
   config.daemon = options[:daemonize]
   config.read_local_config
+  config.sync_remote_config
 end
 
 case options[:action]

data/lib/adminix/config.rb

@@ -8,15 +8,19 @@ module Adminix
     DEFAULT_HOST = 'https://api.adminix.io'.freeze
     DEFAULT_WEBSOCKET_HOST = 'wss://api.adminix.io/websocket'.freeze
     DEFAULT_SETUP_SERVER_PORT = '8080'
+    DEFAULT_WATCHER_SYNC_PERIOD = 10.freeze
+    DEFAULT_LOGS_SYNC_PERIOD = 3.freeze
+    DEFAULT_LOGS_ENABLED = true
 
-    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
+    attr_accessor :service_id, :secret_key, :host, :commands, :daemon, :setup_server_port, :scripts, :watch_log_files, :watcher_sync_period, :logs_sync_period, :logs_enabled, :websocket_path, :mode, :working_dir
 
     def initialize
       @host = ENV['ADMINIX_HOST'] || DEFAULT_HOST
       @setup_server_port = ENV['ADMINIX_SETUP_SERVER_PORT'] || DEFAULT_SETUP_SERVER_PORT
       @commands = []
-      @watcher_sync_period = 10
-      @logs_sync_period = 3
+      @watcher_sync_period = DEFAULT_WATCHER_SYNC_PERIOD
+      @logs_sync_period = DEFAULT_LOGS_SYNC_PERIOD
+      @logs_enabled = DEFAULT_LOGS_ENABLED
       @websocket_path = ENV['ADMINIX_WEBSOCKET_HOST'] || DEFAULT_WEBSOCKET_HOST
       @mode = 'classic'
       @working_dir = `pwd`.split("\n").first
@@ -63,6 +67,24 @@ module Adminix
       end
     end
 
+    def sync_remote_config
+      uri = URI.parse("#{@host}/v1/services/#{@service_id}/watcher_config")
+      request = Net::HTTP::Get.new(uri)
+      request["Authorization"] = "Bearer #{@secret_key}"
+
+      opts = { use_ssl: uri.scheme == 'https' }
+      response = Net::HTTP.start(uri.hostname, uri.port, opts) do |http|
+        http.request(request)
+      end
+ 
+      data = JSON.parse(response.body)
+      result = data['result'] || {}
+
+      @watcher_sync_period = result['sync_period'] || DEFAULT_WATCHER_SYNC_PERIOD
+      @logs_sync_period = result['logs_sync_period'] || DEFAULT_LOGS_SYNC_PERIOD
+      @logs_enables = result.key?('logs_enabled') ? result['logs_enabled'] == true : DEFAULT_LOGS_ENABLED
+    end
+
     def export_credentials
       create_config_root_if_not_exists
 

data/lib/adminix/service.rb

@@ -36,7 +36,7 @@ module Adminix
       commands_queue.each do |q|
         if q['status'] != 'processed'
           res = execute_command(q['command_key'], q['process_id'], q['args'] || {})
-          ws_client.perform(:task_completed, res)
+          ws_client.perform(:task_completed, res) if ws_client.subscribed?
         end
       end
     end

data/lib/adminix/version.rb

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

data/lib/adminix/watcher.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminix
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.29
 platform: ruby
 authors:
 - Christian Dyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: action_cable_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Adminix