herdst_worker 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5b5decf991f20026eb7fe48327f09a7c385c6fad0fdff66e683a4d4d142c8d8
-  data.tar.gz: f3e8a159f0ceb54681f120a69c688ed95a86e78a1f7c008b960f2bd41c3558eb
+  metadata.gz: 2a22c87720c3490c3c559fb6504879578873ee9528ba097ac87b734cbe9006e9
+  data.tar.gz: 3573d7bf2938987eb30746c2d3d0c8f81550e48490b4e86d64b712677a19cc43
 SHA512:
-  metadata.gz: 768569b090a702a755a589d353af9c9f67d478c7a8e81bc7a6a92f04d5b3c826a11e546fa237347ed5e8c83284b630803673b749c830a32a2cfb87ff3e4fe5a3
-  data.tar.gz: 84044ceab2c26c95c5338b16d3ef4c97596781b04a5d4a341550aef02b7cd166d2b4eed1013986868ceaeacfe6066719b01e9c9f3089e856ac01aaee4d35fb08
+  metadata.gz: 42b58f80f8afd138a3e293b4c03281a04175a0c99c0e03f53bc5290055ca9ac74d795b9375c244ecfc2a14c53aa01cb1843234ff3f4fdf0e441cd3efc9eb652c
+  data.tar.gz: 739409b7e24a5af700013e0baaede632471a7ff0a876a095c85ab5a5c6f7c9e3cdc9431115b5f02751e349e62915972af6bf9fd08af06e5aae915f73dbb3e08f

data/bin/herdst_worker

@@ -1,15 +1,21 @@
 #!/usr/bin/env ruby
 
-args = Hash[ ARGV.flat_map { |s| s.scan(/--?([^=\s]+)(?:=(\S+))?/) } ]
+args = ARGV
+    .flat_map { |s| s.scan(/--?([^=\s]+)(?:=(\S+))?/) }
+    .select { |i| i[1] != "" }
 
-application_file = args["application"] || "application.rb"
+arg_pair = Hash[ args ]
+application_name = arg_pair["name"]
+application_file = arg_pair["application"] || "application.rb"
 application_path = "#{Dir.pwd}/#{application_file}"
-application_env = args["env"] || "production"
-queue_enabled = args["queue_enabled"] == "false" ? false : true
+application_env = arg_pair["env"] || "production"
+queue_enabled = arg_pair["queue_enabled"] == "false" ? false : true
+
+raise "Please specify a name for the application E.g. --name=[name]" unless application_name
 
 require_relative "../lib/herdst_worker"
 
-application_instance = HerdstWorker::Application.new(application_env, queue_enabled)
+application_instance = HerdstWorker::Application.new(application_env, application_name, queue_enabled)
 
 require_relative application_path
 

data/lib/herdst_worker/adapters/database.rb

@@ -4,25 +4,29 @@ module HerdstWorker
             
             
             def self.setup(app)
-                db_config = app.config_for(:database)
-                
-                if app.config.is_dev?
-                    ActiveRecord::Base.logger = app.logger.activerecord
+                begin
+                    db_config = app.config_for(:database)
+                    
+                    if app.config.is_dev?
+                        ActiveRecord::Base.logger = app.logger.activerecord
+                    end
+                    
+                    ActiveRecord::Base.default_timezone = :utc
+                    ActiveRecord::Base.establish_connection(
+                        adapter:    db_config[:adapter],
+                        encoding:   db_config[:encoding],
+                        charset:    db_config[:charset],
+                        collation:  db_config[:collation],
+                        pool:       db_config[:pool],
+                        host:       db_config[:host],
+                        username:   db_config[:username],
+                        password:   db_config[:password],
+                        database:   db_config[:database]
+                    )
+                    ActiveRecord::Base.connection.enable_query_cache!
+                rescue Exception => ex
+                    app.logger.error ex.message
                 end
-                
-                ActiveRecord::Base.default_timezone = :utc
-                ActiveRecord::Base.establish_connection(
-                    adapter:    db_config[:adapter],
-                    encoding:   db_config[:encoding],
-                    charset:    db_config[:charset],
-                    collation:  db_config[:collation],
-                    pool:       db_config[:pool],
-                    host:       db_config[:host],
-                    username:   db_config[:username],
-                    password:   db_config[:password],
-                    database:   db_config[:database]
-                )
-                ActiveRecord::Base.connection.enable_query_cache!
             end
             
             

data/lib/herdst_worker/adapters/sentry.rb

@@ -7,16 +7,20 @@ module HerdstWorker
             
             
             def self.setup(app)
-                environment = app.config.metadata[:DEPLOYMENT_ENV]
-                release = app.config.metadata[:RELEASE_VERSION]
-                sentry_key = app.config.metadata[:SENTRY_KEY]
-                
-                Raven.configure do |config|
-                    config.current_environment = environment
-                    config.release = release
-                    config.dsn = sentry_key if sentry_key
-                    config.environments = ["preview", "production"]
-                    config.async = lambda { |event| Thread.new { Raven.send_event(event) } }
+                begin
+                    environment = app.config.metadata[:DEPLOYMENT_ENV]
+                    release = app.config.metadata[:RELEASE_VERSION]
+                    sentry_key = app.config.metadata[:SENTRY_KEY]
+                    
+                    Raven.configure do |config|
+                        config.current_environment = environment
+                        config.release = release
+                        config.dsn = sentry_key if sentry_key
+                        config.environments = ["preview", "production"]
+                        config.async = lambda { |event| Thread.new { Raven.send_event(event) } }
+                    end
+                rescue Exception => ex
+                    app.logger.error ex.message
                 end
             end
             

data/lib/herdst_worker/application/facade.rb

@@ -15,14 +15,15 @@ module HerdstWorker
         attr_accessor :poller_enabled, :queues, :poller_url, :queue
         
         
-        def initialize(env, poller_enabled)
+        def initialize(env, name, poller_enabled)
+            self.name = name
             self.poller_enabled = poller_enabled
             self.queues = ActiveSupport::HashWithIndifferentAccess.new
             
             HerdstWorker.set_application(self)
             
             self.logger = HerdstWorker::Log::Facade.new(get_logger_level(env))
-            self.config = HerdstWorker::Configuration::Facade.new(env)
+            self.config = HerdstWorker::Configuration::Facade.new(env, name)
             self.autoload = HerdstWorker::Autoload::Facade.new(self)
             self.set_inflections
             

data/lib/herdst_worker/configuration/facade.rb

@@ -13,11 +13,11 @@ module HerdstWorker
             attr_accessor :env, :metadata, :paths, :actions
             
             
-            def initialize(env)
+            def initialize(env, name)
                 self.env = env.downcase
                 
                 self.paths = Paths.new
-                self.metadata = Metadata.new(env, self)
+                self.metadata = Metadata.new(env, name, self)
                 self.actions = self.config_for(:actions)
             end
             

data/lib/herdst_worker/configuration/metadata.rb

@@ -13,10 +13,10 @@ module HerdstWorker
             attr_accessor :config_suffix, :secrets_suffix
             
             
-            def initialize(env, config)
+            def initialize(env, name, config)
                 self.config = config
-                self.config_suffix = "-service-config"
-                self.secrets_suffix = "-service-secrets"
+                self.config_suffix = "-#{name}-service-config"
+                self.secrets_suffix = "-#{name}-service-secrets"
                 
                 self.secrets = {}.with_indifferent_access
                 self.secrets["ENV"] = env

data/lib/herdst_worker/version.rb

@@ -1,3 +1,3 @@
 module HerdstWorker
-  VERSION = '0.1.0'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herdst_worker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Herd.St
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport