check-taskr 1.1.0 → 1.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/bin/check-taskr +8 -10
- data/lib/check-taskr/cli.rb +10 -2
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.1.
|
1
|
+
1.1.1
|
data/bin/check-taskr
CHANGED
@@ -5,24 +5,22 @@
|
|
5
5
|
$LOAD_PATH.unshift(File.dirname(__FILE__))
|
6
6
|
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
|
7
7
|
|
8
|
-
|
9
8
|
require 'rubygems'
|
10
9
|
require 'sinatra'
|
11
10
|
|
12
11
|
require 'log4r'
|
13
|
-
|
14
12
|
require "log4r/outputter/datefileoutputter"
|
15
|
-
|
16
13
|
include Log4r
|
17
|
-
|
18
|
-
# create a logger named 'mylog' that logs to stdout
|
19
|
-
log = Logger.new 'default'
|
20
|
-
log.outputters = Log4r::DateFileOutputter.new('check_log', :dirname => "./logs")
|
21
|
-
log.level = WARN
|
22
|
-
|
23
14
|
require "check-taskr"
|
24
15
|
|
25
|
-
|
16
|
+
filename = "jobs"
|
17
|
+
logdir = "./logs"
|
18
|
+
if ARGV.size > 0
|
19
|
+
filename = ARGV[0]
|
20
|
+
logdir = File.dirname(File.realdirpath(filename)) + "/logs"
|
21
|
+
end
|
22
|
+
|
23
|
+
CheckTaskr::Cli.execute(filename, :logdir => logdir)
|
26
24
|
config = CheckTaskr::JobsConfiguration.instance
|
27
25
|
|
28
26
|
CheckTaskr::App.run! :port => config.listen_port
|
data/lib/check-taskr/cli.rb
CHANGED
@@ -2,15 +2,23 @@
|
|
2
2
|
require "fastthread"
|
3
3
|
require "check-taskr/base"
|
4
4
|
|
5
|
+
|
5
6
|
Dir[File.join(File.dirname(__FILE__), 'task/*.rb')].sort.each { |lib| require lib }
|
6
7
|
|
7
8
|
module CheckTaskr
|
8
9
|
class Cli
|
9
10
|
|
10
|
-
def self.execute(options = {})
|
11
|
+
def self.execute(filename, options = {})
|
12
|
+
logdir = options.delete(:logdir)
|
13
|
+
# create a logger named 'mylog' that logs to stdout
|
14
|
+
log = Logger.new 'default'
|
15
|
+
log.outputters = Log4r::DateFileOutputter.new('check_log', :dirname => logdir)
|
16
|
+
log.level = WARN
|
17
|
+
|
18
|
+
log.debug("load #{filename} file, log on #{logdir} ...")
|
11
19
|
|
12
20
|
config = CheckTaskr::JobsConfiguration.instance
|
13
|
-
config.load_from_file(
|
21
|
+
config.load_from_file(filename)
|
14
22
|
|
15
23
|
t = Thread.new do
|
16
24
|
while true do
|