cloud66_agent 1.0.2 → 1.0.3
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.
|
@@ -18,7 +18,7 @@ module Cloud66
|
|
|
18
18
|
load if File.exists?(CONFIG_PATH)
|
|
19
19
|
|
|
20
20
|
# set defaults
|
|
21
|
-
@log = @log.nil? || @log
|
|
21
|
+
@log = @log.nil? || @log == "STDOUT" ? STDOUT : @log
|
|
22
22
|
@log_level ||= 2
|
|
23
23
|
@api_url ||= 'https://api.cloud66.com'
|
|
24
24
|
@disabled ||= false
|
|
@@ -39,7 +39,7 @@ module Cloud66
|
|
|
39
39
|
'agent_uid' => @agent_uid,
|
|
40
40
|
'disabled' => @disabled,
|
|
41
41
|
'log' => @log == STDOUT ? "STDOUT" : @log,
|
|
42
|
-
'log_level' => @log_level
|
|
42
|
+
'log_level' => @log_level,
|
|
43
43
|
}
|
|
44
44
|
YAML::dump(data, out)
|
|
45
45
|
end
|
|
@@ -58,10 +58,9 @@ module Cloud66
|
|
|
58
58
|
@api_key = config['api_key']
|
|
59
59
|
@secret_key = config['secret_key']
|
|
60
60
|
@agent_uid = config['agent_uid']
|
|
61
|
+
@disabled = config['disabled']
|
|
61
62
|
@log = config['log']
|
|
62
|
-
|
|
63
|
-
config_log_level = config['log_level']
|
|
64
|
-
@log_level = config_log_level.to_i if config_log_level
|
|
63
|
+
@log_level = config['log_level']
|
|
65
64
|
rescue
|
|
66
65
|
# we can't load the file
|
|
67
66
|
end
|