diff --git a/Mage/Console.php b/Mage/Console.php index 9f643b7..9d92b39 100644 --- a/Mage/Console.php +++ b/Mage/Console.php @@ -1,10 +1,11 @@ &1', $return); $log = ob_get_clean(); + + self::log($log); + self::log('---------------------------------'); return !$return; } @@ -94,4 +103,14 @@ class Mage_Console break; } } + + public static function log($message, $continuation = false) + { + if (self::$_log == null) { + self::$_log = fopen('.mage/logs/log-' . date('Ymd-His') . '.log', 'w'); + } + + $message = date('Y-m-d H:i:s -- ') . $message; + fwrite(self::$_log, $message . PHP_EOL); + } } \ No newline at end of file diff --git a/Mage/Task/BuiltIn/Deployment/Rsync.php b/Mage/Task/BuiltIn/Deployment/Rsync.php index abf78ba..d207dba 100644 --- a/Mage/Task/BuiltIn/Deployment/Rsync.php +++ b/Mage/Task/BuiltIn/Deployment/Rsync.php @@ -24,7 +24,7 @@ class Mage_Task_BuiltIn_Deployment_Rsync } $command = 'rsync -avz ' - . $this->_excludes($excludes + $userExcludes) . ' ' + . $this->_excludes(array_merge($excludes, $userExcludes)) . ' ' . $this->_config['deploy']['deploy-from'] . ' ' . $this->_config['deploy']['user'] . '@' . $this->_config['deploy']['host'] . ':' . $this->_config['deploy']['deploy-to']; diff --git a/bin/mage.php b/bin/mage.php index dbf51cc..13b6b5a 100644 --- a/bin/mage.php +++ b/bin/mage.php @@ -17,6 +17,7 @@ # mage add environment production # mage deploy to:production +date_default_timezone_set('UTC'); $baseDir = dirname(dirname(__FILE__));