adminix 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 323d686c0df911e68419b1d4a094d07517fc1728
-  data.tar.gz: b0b3a2c75899feceaa21a2e2cab960475293edbf
+  metadata.gz: ed51b6024e1e9da59e6f64d6ec5dc5187d59bd46
+  data.tar.gz: d595961de804152a6d571b761e749a0a6ef65f14
 SHA512:
-  metadata.gz: '061087a77def56a10ad4f6c47284d609da99a36783ab271a57e3f488176470ef170dee6ff14f2faf05b5444d37b7f09034c7f132cc3dcdf571e36862a766005a'
-  data.tar.gz: 8c803731f17b32992c68714e9675e5611c5d7df6a2e149faf6375add59a8281e455af6f8f2170ab66cb61d08b8af8335e35b391a4dbb7ee883e2e42ac33845ee
+  metadata.gz: ca709fe8f560c59566a2046c59d2c0c06c35efe9192b9d94b81a51c4b09d31386688ed56b331716cef6ac4dfdf81f74c9025d7c81dd5191e4ee52711cabbdb92
+  data.tar.gz: fce3a9bed9d92d62e6b70e0b8f4b36e417c0a545ab7189585e58fd4d7a6d49637273c2fd71ce5fb97be5535709e3c7178fd3a2c73b069f72b2927ae3c96289bf

data/exe/adminix

@@ -48,9 +48,7 @@ unless options[:action] == "help"
   config.secret_key = options[:secret_key]
   config.service_id = options[:service_id]
   config.daemon = options[:daemonize]
-  if !config.credentials_defined? && config.creds_file_exists?
-    config.read_creds_file
-  end 
+  config.read_local_config
 end
 
 case options[:action]

data/lib/adminix/config.rb

@@ -6,35 +6,92 @@ module Adminix
     include Singleton
 
     DEFAULT_HOST = 'https://api.adminix.io'.freeze
+    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
+    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
 
     def initialize
-      self.host = ENV['ADMINIX_HOST'] || DEFAULT_HOST
-      self.setup_server_port = ENV['ADMINIX_SETUP_SERVER_PORT'] || DEFAULT_SETUP_SERVER_PORT
-      self.commands = []
+      @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
+      @websocket_path = ENV['ADMINIX_WEBSOCKET_HOST'] || DEFAULT_WEBSOCKET_HOST
+      @mode = 'classic'
+      @scripts = {
+        watcher_start: 'sudo systemctl start adminix.service',
+        watcher_stop: 'sudo systemctl stop adminix.service',
+        process_start: 'sudo systemctl start adminix_process.service',
+        process_stop: 'sudo systemctl stop adminix_process.service'
+      }
+      @watch_log_files = []
+
+      @config_store_path = "#{ENV['HOME']}/.config"
+      @root_path = "#{@config_store_path}/adminix"
+      @creds_path = "#{@root_path}/credentials"
+      @config_path = "#{@root_path}/config"
     end
 
-    def read_creds_file
-      file_content = IO.read("#{ENV['HOME']}/.adminix")
-      data = JSON.parse(file_content) rescue nil
 
-      unless data.nil?
-        self.service_id ||= data['service_id']
-        self.secret_key ||= data['secret_key']
+    def read_local_config
+      if File.exists?(@creds_path)
+        content = IO.read(@creds_path)
+        data = JSON.parse(content) rescue {}
+
+        @service_id ||= data['service_id']
+        @secret_key ||= data['secret_key']
       end
 
-      true
+      if File.exists?(@config_path)
+        content = IO.read(@config_path)
+        data = JSON.parse(content) rescue {}
+
+        @mode = data['mode'] || 'classic'
+
+        scripts = data['scripts'] || {}
+        @scripts = {
+          watcher_start: scripts['watcher_start'],
+          watcher_stop: scripts['watcher_stop'],
+          process_start: scripts['process_start'],
+          process_stop: scripts['process_stop']
+        }
+
+        @watch_log_files = data['watch_logs'] || []
+      end
+    end
+
+    def export_credentials
+      create_config_root_if_not_exists
+
+      open(@creds_path, 'w') do |f|
+        f.puts(credentials.to_json)
+      end
     end
 
     def creds_file_exists?
-      File.exists?("#{ENV['HOME']}/.adminix")
+      File.exists?(@creds_path)
     end
 
     def credentials_defined?
       !service_id.nil? && !secret_key.nil?
     end
+
+    private
+
+    def credentials
+      { service_id: @service_id, secret_key: @secret_key }
+    end
+
+    def create_config_root_if_not_exists
+      unless Dir.exists?(@config_store_path)
+        Dir.mkdir(@config_store_path)
+      end
+
+      unless Dir.exists?(@root_path)
+        Dir.mkdir(@root_path)
+      end
+    end
   end
 end
 

data/lib/adminix/log_watch_handler.rb

@@ -0,0 +1,23 @@
+module Adminix
+  module LogWatchHandler
+    def file_modified
+      #puts "#{path} modified"
+      unless Service.instance.syncing_logs
+        Service.instance.new_logs = true
+      end
+    end
+
+    def file_moved
+      #puts "#{path} moved"
+    end
+
+    def file_deleted
+      #puts "#{path} deleted"
+    end
+
+    def unbind
+      #puts "#{path} monitoring ceased"
+    end
+  end
+end
+

data/lib/adminix/service.rb

@@ -1,14 +1,18 @@
 require 'singleton'
 require 'net/http'
-
+require 'byebug'
 module Adminix
   class Service
     include Singleton
    
-    attr_reader :id, :process_id
+    attr_accessor :new_logs
+    attr_reader :id, :process_id, :watching_logs, :syncing_logs
 
     def initialize
       @id = config.service_id
+      @watching_logs = []
+      @new_logs = false
+      @syncing_logs = false
     end
 
     def to_cable
@@ -37,6 +41,30 @@ module Adminix
       end
     end
 
+    def sync_logs(ws_client)
+      return unless new_logs
+      
+      @syncing_logs = true
+
+      @watching_logs.each do |l|
+        initial_length = l[:lines]
+        current_length = file_lines_number(l[:path])
+        new_lines = current_length > initial_length ? current_length - initial_length : 100
+        lines = `tail -#{new_lines} #{l[:path]}`.split("\n") rescue []
+        payload = lines.map { |line| { created_at: Time.now.to_s, level: 'NOTICE', message: line } }
+        begin
+          puts "Syncing new logs"
+          ws_client.perform(:add_logs, { logs: payload }) if ws_client.subscribed?
+        rescue
+        end
+      end
+
+      count_logs_lines
+
+      @new_logs = false
+      @syncing_logs = false
+    end
+
     def options_to_envs
       data = fetch_options
 
@@ -60,7 +88,7 @@ module Adminix
     end
 
     def fetch_options
-      uri = URI.parse("#{config.host}/api/v1/services/#{id}/options")
+      uri = URI.parse("#{config.host}/v1/services/#{id}/options")
       request = Net::HTTP::Get.new(uri)
       request["Authorization"] = "Bearer #{config.secret_key}"
 
@@ -72,13 +100,24 @@ module Adminix
       JSON.parse(response.body)
     end
 
+    def count_logs_lines
+      @watching_logs = config.watch_log_files.map do |file_path|
+        { lines: file_lines_number(file_path), path: file_path }
+      end
+    end
+
     def restart!
       stop!
     end
 
     def stop!
       system.log "Stopping process"
-      Process.kill('INT', 1) rescue nil
+      case config.mode
+      when 'classic'
+        system.eval("#{config.scripts[:watcher_stop]} && #{config.scripts[:watcher_start]}")
+      when 'docker'
+        Process.kill('INT', 1) rescue nil
+      end
     end
 
     private
@@ -91,6 +130,10 @@ module Adminix
       System.instance
     end
 
+    def file_lines_number(file_path)
+      `wc -l #{file_path}`.to_i
+    end
+
     def execute_command(key, process_id, args)
       command = config.commands.find { |c| c['key'] == key }
       script = command['command'].dup

data/lib/adminix/setup/routes.rb

@@ -85,6 +85,10 @@ module Adminix::Setup
         secret_key = Services.get_secret_key(params[:t])
         if id_is_valid && !secret_key.nil?
           Services.import_settings(secret_key, params[:id])
+          Thread.start do
+            sleep(2)
+            Adminix::Service.instance.restart!
+          end
           render('complete')
         else
           render('error')
@@ -101,7 +105,7 @@ module Adminix::Setup
     end
 
     set :bind, '0.0.0.0'
-    set :port, Adminix::Config.instance.setup_server_port
+    set :port, Adminix::Config::DEFAULT_SETUP_SERVER_PORT
 
     run!
   end

data/lib/adminix/setup/services.rb

@@ -127,10 +127,11 @@ module Adminix::Setup
     end
 
     def self.import_settings(secret_key, service_id)
-      open("#{ENV['HOME']}/.adminix", 'w') do |f|
-        f.puts({ secret_key: secret_key, service_id: service_id }.to_json)
-      end
-
+      config = Adminix::Config.instance
+      config.service_id = service_id
+      config.secret_key = secret_key
+      config.export_credentials
+      
       true
     end
   end

data/lib/adminix/version.rb

@@ -1,3 +1,3 @@
 module Adminix
-  VERSION = "0.1.24"
+  VERSION = "0.1.25"
 end

data/lib/adminix/watcher.rb

@@ -13,30 +13,41 @@ module Adminix
       end
     end
 
-    SYNC_PERIOD = 5.freeze
-    DEFAULT_WEBSOCKET_HOST = 'wss://api.adminix.io/websocket'.freeze
     SERVICE_CHANNEL = 'ServiceChannel'.freeze
 
     def initialize(opts)
+      @sync_period = config.watcher_sync_period
       @pid_full = '/tmp/adminix.pid'
       @service = Service.instance
       
       @ws_client = nil
-      ws_path = opts[:websocket_host] || ENV['ADMINIX_WEBSOCKET_HOST'] || DEFAULT_WEBSOCKET_HOST
-      @ws_uri = "#{ws_path}?secret_key=#{config.secret_key}"
+      @ws_uri = "#{config.websocket_path}?secret_key=#{config.secret_key}"
       @ws_channel = { channel: 'ServiceChannel', service_id: @service.id }
+      @ws_logs_channel = { channel: 'LogsChannel', service_id: @service.id }
+
+      @watching_files = []
+
+      if EM.epoll?
+        EM.epoll
+      elsif EM.kqueue?
+        EM.kqueue
+      else
+        Kernel.warn('Neither epoll nor kqueue are supported.')
+      end
     end
 
     def run!
       trap_signal
-      
+
+      Adminix::Service.instance.count_logs_lines
+
       EventMachine.run do
         @ws_client = ActionCableClient.new(@ws_uri, @ws_channel)
         @ws_client.connected do |msg|
-          puts 'Connection established'
+          puts 'Service connection established'
         end
         @ws_client.disconnected do
-          system.log 'Disconnected. Reconnecting...'
+          system.log 'Service disconnected. Reconnecting...'
           sleep(2)
           @ws_client.connect!
         end
@@ -48,9 +59,30 @@ module Adminix
           end
         end
 
-        EventMachine.add_periodic_timer(SYNC_PERIOD) do
+        @ws_logs_client = ActionCableClient.new(@ws_uri, @ws_logs_channel)
+        @ws_logs_client.connected do |msg|
+          puts 'Logs connection established'
+        end
+        @ws_logs_client.disconnected do
+          system.log 'Logs disconnected. Reconnecting...'
+          sleep(2)
+          @ws_logs_client.connect!
+        end
+        @ws_logs_client.received { |msg| }
+
+        # Sync watcher
+        EventMachine.add_periodic_timer(config.watcher_sync_period) do
           @ws_client.perform(:sync, @service.to_cable) if @ws_client.subscribed?
         end
+
+        # Logs watcher
+        config.watch_log_files.each do |file_path|
+          EventMachine.watch_file(file_path, Adminix::LogWatchHandler)
+        end
+
+        EventMachine.add_periodic_timer(config.logs_sync_period) do
+          Adminix::Service.instance.sync_logs(@ws_logs_client)
+        end
       end
     end
 

data/lib/adminix.rb

@@ -2,6 +2,7 @@ require 'adminix/version'
 require 'adminix/config'
 require 'adminix/service'
 require 'adminix/system'
+require 'adminix/log_watch_handler'
 require 'adminix/watcher'
 
 module Adminix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminix
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Christian Dyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -157,6 +157,7 @@ files:
 - lib/adminix.rb
 - lib/adminix/.service.rb.swn
 - lib/adminix/config.rb
+- lib/adminix/log_watch_handler.rb
 - lib/adminix/service.rb
 - lib/adminix/setup.rb
 - lib/adminix/setup/routes.rb