engineyard-serverside 2.5.0.cs3 → 2.5.0.cs4
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.
|
@@ -19,9 +19,8 @@ module EY
|
|
|
19
19
|
|
|
20
20
|
log_pathname = Pathname.new(options[:log_path])
|
|
21
21
|
log_pathname.unlink if log_pathname.exist? # start fresh
|
|
22
|
-
@logger = Logger.new(
|
|
22
|
+
@logger = Logger.new($stdout)
|
|
23
23
|
@logger.level = Logger::DEBUG # Always log to the file at debug, formatter hides debug for non-verbose
|
|
24
|
-
@logger.formatter = EY::Serverside::Shell::Formatter.new(@stdout, @stderr, start_time, @verbose)
|
|
25
24
|
end
|
|
26
25
|
|
|
27
26
|
def verbose?
|
|
@@ -58,9 +57,9 @@ module EY
|
|
|
58
57
|
# $ cmd blah do \
|
|
59
58
|
# > something more
|
|
60
59
|
# > end
|
|
61
|
-
def command_show(cmd)
|
|
62
|
-
def command_out(msg)
|
|
63
|
-
def command_err(msg)
|
|
60
|
+
def command_show(cmd) $stderr << cmd.gsub(/^/,' > ').sub(/>/, '$') end
|
|
61
|
+
def command_out(msg) $stderr << msg.gsub(/^/,' ') end
|
|
62
|
+
def command_err(msg) $stderr << msg.gsub(/^/,' ') end
|
|
64
63
|
|
|
65
64
|
def logged_system(cmd, server = nil)
|
|
66
65
|
EY::Serverside::Spawner.run(cmd, self, server)
|