uc 0.1.2 → 0.1.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/uc +5 -1
- data/lib/uc/config.rb +32 -3
- data/lib/uc/server.rb +8 -0
- data/lib/uc/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7c7e51410c3930c1c7437db016b73ef87a9ccebf
|
4
|
+
data.tar.gz: 30fc1573549a4132958199d33d6ff51e82ac3df1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0762848271d2fb9fedd82f9654b972efc9378b81028b44c01a72998561858b7c81c1f59aa5bdb80f913be2359ca10471d403971f4492bfad143f7b9e5ebbd7ca
|
7
|
+
data.tar.gz: 5ad4a424f748b00755ea0cfb98c38245cdab398736bfadf94a97dcc0486c7e08c6aceebe34701a97a4d43fff839655bcdec4e7fb47a7372dfb4e9445efdf0542
|
data/bin/uc
CHANGED
@@ -76,6 +76,8 @@ begin
|
|
76
76
|
server.rolling_restart
|
77
77
|
when "print-config"
|
78
78
|
server.print_config
|
79
|
+
when "reopen-logs"
|
80
|
+
server.reopen_logs
|
79
81
|
when nil
|
80
82
|
logger.error "No command specified"
|
81
83
|
puts opts_parser
|
@@ -86,9 +88,11 @@ begin
|
|
86
88
|
end
|
87
89
|
|
88
90
|
rescue OptionParser::InvalidOption, OptionParser::MissingArgument, ::Uc::Error => e
|
91
|
+
cause = e.cause
|
89
92
|
if options[:trace]
|
90
|
-
raise e
|
93
|
+
cause ? (raise cause) : (raise e)
|
91
94
|
else
|
95
|
+
logger.debug "#{cause.message}" if cause
|
92
96
|
logger.error "#{e.message}"
|
93
97
|
abort
|
94
98
|
end
|
data/lib/uc/config.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
require 'uc/logger'
|
2
|
+
require 'uc/error'
|
2
3
|
|
3
4
|
module Uc
|
4
5
|
class Config
|
@@ -57,7 +58,7 @@ module Uc
|
|
57
58
|
config[:timeout] = secs
|
58
59
|
end
|
59
60
|
|
60
|
-
def working_dir
|
61
|
+
def working_dir(working_dir)
|
61
62
|
config[:working_dir] = working_dir
|
62
63
|
end
|
63
64
|
|
@@ -77,13 +78,41 @@ module Uc
|
|
77
78
|
env_hash[key] = value
|
78
79
|
end
|
79
80
|
|
81
|
+
def env_yml(path, safe: false)
|
82
|
+
@skip_autoload = true
|
83
|
+
load_env_yml path, safe: safe
|
84
|
+
end
|
85
|
+
|
80
86
|
def load_env
|
81
87
|
config
|
88
|
+
if not @skip_autoload
|
89
|
+
load_env_yml "#{app_dir}/config/env.yml", safe: true, override: false
|
90
|
+
end
|
82
91
|
env_hash.each do |k,v|
|
83
|
-
ENV[k] = v
|
92
|
+
ENV[k] = v.to_s
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
|
97
|
+
def load_env_yml(path, safe: false, override: true)
|
98
|
+
if not File.readable? path
|
99
|
+
logger.debug "skipped loading env from #{path}"
|
100
|
+
end
|
101
|
+
require 'yaml'
|
102
|
+
h = YAML.load_file(path)
|
103
|
+
env_hash.merge!(h) do |key, v1, v2|
|
104
|
+
override ? v2 : v1
|
105
|
+
end
|
106
|
+
logger.debug "loaded env from #{path}"
|
107
|
+
rescue => e
|
108
|
+
error_message = "failed to load env from #{path}: #{e.message}"
|
109
|
+
if not safe
|
110
|
+
raise ::Uc::Error, error_message
|
111
|
+
else
|
112
|
+
logger.debug error_message
|
84
113
|
end
|
85
114
|
end
|
86
|
-
|
115
|
+
|
87
116
|
def read_from_file
|
88
117
|
return if not File.readable? config_file
|
89
118
|
instance_eval(File.read(config_file))
|
data/lib/uc/server.rb
CHANGED
@@ -28,6 +28,7 @@ module Uc
|
|
28
28
|
puts server_status
|
29
29
|
return
|
30
30
|
end
|
31
|
+
ENV["UNICORN_APP_DIR"] = config.app_dir
|
31
32
|
event_stream.expect_in_background :fin do
|
32
33
|
cmd %{unicorn -c #{uconfig.path} -D -E #{rails_env} }, return_output: false,
|
33
34
|
error_msg: "error starting unicorn"
|
@@ -74,6 +75,13 @@ module Uc
|
|
74
75
|
end
|
75
76
|
end
|
76
77
|
|
78
|
+
def reopen_logs
|
79
|
+
init_once
|
80
|
+
return if not server_status.running?
|
81
|
+
Process.kill(:USR1 , server_status.pid)
|
82
|
+
puts "reopened logs"
|
83
|
+
end
|
84
|
+
|
77
85
|
private
|
78
86
|
|
79
87
|
def server_status
|
data/lib/uc/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: uc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Neeraj
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-11-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|