lib/jitsu/commands/logs.js

@@ -49,9 +49,21 @@ logs.tail = function (appName, callback) {
           : callback(err);
       }
 
-      jitsu.logs.live(appName, function (socket) {
+      var amount = 10;
+      jitsu.logs.byApp(appName, amount, function (err, results) {
+        if (err) {
+          return callback(err);
+        }
+
         jitsu.log.info('Listing logs for ' + appName.magenta);
-        socket.on('data', printLog);
+
+        putLogs(results, appName, amount);
+
+        jitsu.logs.live(appName, function (err, socket) {
+          if (err) return callback(err);
+
+          socket.on('data', printLog);
+        });
       });
     });
   }
@@ -211,7 +223,7 @@ function putLogs (results, appName) {
     appName = appName.split('/')[1];
   }
 
-  if (results.length === 0) {
+  if (!results || results.length === 0) {
     return jitsu.log.warn('No logs for ' + appName.magenta + ' in specified timespan');
   }
 
@@ -227,6 +239,11 @@ function putLogs (results, appName) {
 
 function printLog(datum) {
   if (datum.description && datum.description !== null) {
+
+    if (jitsu.argv.raw) {
+      return console.log(datum);
+    }
+
     datum.description.split('\n').forEach(function (line) {
       var now = new Date(datum.time * 1000);
       now = dateformat(now, "mm/dd HH:MM:ss Z");

lib/jitsu/config.js

@@ -59,7 +59,12 @@ var defaults = {
   root: process.env.HOME,
   timeout: 4 * 60 * 1000,
   tmproot: path.join(process.env.HOME, '.jitsu/tmp'),
-  userconfig: '.jitsuconf'
+  userconfig: '.jitsuconf',
+  logs: {
+    host: "logs.nodejitsu.com",
+    port: 80,
+    protocol: "http"
+  }
 };
 
 Object.defineProperty(defaults, 'remoteUri', {