engineyard-serverside 2.5.0.cs5 → 2.5.0.cs6

data/lib/engineyard-serverside/deploy.rb

@@ -352,8 +352,8 @@ YML
         [
           ["Set group write permissions",           "chmod -R g+w #{paths.active_release}"],
           ["Remove public/system if symlinked",     "if [ -L \"#{paths.public_system}\" ]; then rm -rf #{paths.public_system}; fi"],
-          ["Remove symlinked shared directories",   "rm -rf #{paths.active_log} #{paths.active_release}/tmp/pids"],
-          ["Create tmp directory",                  "mkdir -p #{paths.active_release}/tmp"],
+          ["Remove symlinked shared directories",   "rm -rf #{paths.active_log} #{paths.active_release}/tmp"],
+          ["Create tmp directory",                  "mkdir -p #{paths.shared}/tmp && ln -nfs #{paths.shared}/tmp #{paths.active_release}/tmp"],
           ["Create public directory",               "mkdir -p #{paths.public}"],
           ["Create config directory",               "mkdir -p #{paths.active_release_config}"],
           ["Symlink shared log directory",          "ln -nfs #{paths.shared_log} #{paths.active_log}"],

data/lib/engineyard-serverside/shell.rb

@@ -18,8 +18,9 @@ module EY
 
         log_pathname = Pathname.new(options[:log_path])
         log_pathname.unlink if log_pathname.exist? # start fresh
-        @logger = Logger.new($stdout)
+        @logger = Logger.new(log_pathname.to_s)
         @logger.level = Logger::DEBUG # Always log to the file at debug, formatter hides debug for non-verbose
+        @logger.formatter = EY::Serverside::Shell::Formatter.new(@stdout, @stderr, start_time, @verbose)
       end
 
       def verbose?
@@ -56,9 +57,9 @@ module EY
       #   $ cmd blah do \
       #   > something more
       #   > end
-      def command_show(cmd) $stderr << cmd.gsub(/^/,'   > ').sub(/>/, '$') end
-      def command_out(msg)  $stderr << msg.gsub(/^/,'     ') end
-      def command_err(msg)  $stderr << msg.gsub(/^/,'     ') end
+      def command_show(cmd) debug   cmd.gsub(/^/,'   > ').sub(/>/, '$') end
+      def command_out(msg)  debug   msg.gsub(/^/,'     ') end
+      def command_err(msg)  unknown msg.gsub(/^/,'     ') end
 
       def logged_system(cmd, server = nil)
         EY::Serverside::Spawner.run(cmd, self, server)

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.5.0.cs5'
+    VERSION = '2.5.0.cs6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.5.0.cs5
+  version: 2.5.0.cs6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec