Merge pull request #2215 from bacongobbler/fixup-delta-datetime

fix(controller): add timezone back to API

Author: Matthew Fisher

client/deis.py

@@ -296,8 +296,9 @@ def readable_datetime(datetime_str):
     Return a human-readable datetime string from an ECMA-262 (JavaScript)
     datetime string.
     """
-    dt = parser.parse(datetime_str)
-    now = datetime.now()
+    timezone = tz.tzlocal()
+    dt = parser.parse(datetime_str).astimezone(timezone)
+    now = datetime.now(timezone)
     delta = relativedelta.relativedelta(now, dt)
     # if it happened today, say "2 hours and 1 minute ago"
     if delta.days <= 1 and dt.day == now.day:
@@ -604,7 +605,7 @@ def apps_logs(self, args):
             # strip the last newline character
             for line in response.json().split('\n')[:-1]:
                 # get the tag from the log
-                log_tag = line.split(': ')[0].split(' ')[2]
+                log_tag = line.split(': ')[0].split(' ')[1]
                 # colorize the log based on the tag
                 color = sum([ord(ch) for ch in log_tag]) % 6
                 def f(x):

controller/deis/settings.py

@@ -257,7 +257,7 @@
 DEIS_DOMAIN = 'deisapp.local'
 
 # standard datetime format used for logging, model timestamps, etc.
-DEIS_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+DEIS_DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S%Z'
 
 # default scheduler settings
 SCHEDULER_MODULE = 'mock'

logspout/logspout.go

@@ -68,7 +68,7 @@ func syslogStreamer(target Target, types []string, logstream chan *Log) {
 		// HACK: Go's syslog package hardcodes the log format, so let's send our own message
 		_, err = fmt.Fprintf(conn,
 			"%s %s[%s]: %s",
-			time.Now().Format("2006-01-02 15:04:05"),
+			time.Now().Format("2006-01-02T15:04:05MST"),
 			tag,
 			pid,
 			logline.Data)