uc 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d57f87e2a2dd83610d09cfa9aafb3527899bbcb9
-  data.tar.gz: e5039fbec31f1d780b8dd690d112031cad39a42c
+  metadata.gz: 7c7e51410c3930c1c7437db016b73ef87a9ccebf
+  data.tar.gz: 30fc1573549a4132958199d33d6ff51e82ac3df1
 SHA512:
-  metadata.gz: 31aad3db514c3730128e3310bdd3803dabee7c915e8bc32369854034808cd3b04f6d45a0c833cf061d04b91d73309ffc74479b28086caa60129fa6f2773b69ae
-  data.tar.gz: 8834ebf255bf738bf953c0d2204231531585ca27e14bab25b36e6f5661ec260c65a32da1b350996fbf7d0294406e207dfeb5d30921a626d372793113860deeea
+  metadata.gz: 0762848271d2fb9fedd82f9654b972efc9378b81028b44c01a72998561858b7c81c1f59aa5bdb80f913be2359ca10471d403971f4492bfad143f7b9e5ebbd7ca
+  data.tar.gz: 5ad4a424f748b00755ea0cfb98c38245cdab398736bfadf94a97dcc0486c7e08c6aceebe34701a97a4d43fff839655bcdec4e7fb47a7372dfb4e9445efdf0542

data/bin/uc

@@ -76,6 +76,8 @@ begin
     server.rolling_restart
   when "print-config"
     server.print_config
+  when "reopen-logs"
+    server.reopen_logs
   when nil
     logger.error "No command specified"
     puts opts_parser
@@ -86,9 +88,11 @@ begin
   end
 
 rescue OptionParser::InvalidOption, OptionParser::MissingArgument, ::Uc::Error => e
+  cause = e.cause
   if options[:trace]
-    raise e
+    cause ? (raise cause) : (raise e)
   else
+    logger.debug "#{cause.message}" if cause
     logger.error "#{e.message}"
     abort
   end

data/lib/uc/config.rb

@@ -1,4 +1,5 @@
 require 'uc/logger'
+require 'uc/error'
 
 module Uc
   class Config
@@ -57,7 +58,7 @@ module Uc
       config[:timeout] = secs
     end
 
-    def working_dir
+    def working_dir(working_dir)
       config[:working_dir] = working_dir
     end
 
@@ -77,13 +78,41 @@ module Uc
       env_hash[key] = value
     end
 
+    def env_yml(path, safe: false)
+      @skip_autoload = true
+      load_env_yml path, safe: safe
+    end
+
     def load_env
       config
+      if not @skip_autoload
+        load_env_yml "#{app_dir}/config/env.yml", safe: true, override: false
+      end
       env_hash.each do |k,v|
-        ENV[k] = v
+        ENV[k] = v.to_s
+      end
+    end
+
+
+    def load_env_yml(path, safe: false, override: true)
+      if not File.readable? path
+        logger.debug "skipped loading env from #{path}"
+      end
+      require 'yaml'
+      h = YAML.load_file(path)
+      env_hash.merge!(h) do |key, v1, v2|
+        override ? v2 : v1
+      end
+      logger.debug "loaded env from #{path}"
+    rescue => e
+      error_message = "failed to load env from #{path}: #{e.message}"
+      if not safe
+        raise ::Uc::Error, error_message
+      else
+        logger.debug error_message
       end
     end
-    
+
     def read_from_file
       return if not File.readable? config_file
       instance_eval(File.read(config_file))

data/lib/uc/server.rb

@@ -28,6 +28,7 @@ module Uc
         puts server_status
         return
       end
+      ENV["UNICORN_APP_DIR"] = config.app_dir
       event_stream.expect_in_background :fin do
         cmd %{unicorn -c #{uconfig.path} -D -E #{rails_env} }, return_output: false,
           error_msg: "error starting unicorn"
@@ -74,6 +75,13 @@ module Uc
       end
     end
 
+    def reopen_logs
+      init_once
+      return if not server_status.running?
+      Process.kill(:USR1 , server_status.pid)
+      puts "reopened logs"
+    end
+
     private
 
     def server_status

data/lib/uc/version.rb

@@ -1,3 +1,3 @@
 module Uc
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler