From 86550aaf9116479be6b39e1d7081a3f2bee51cc4 Mon Sep 17 00:00:00 2001
From: wchen <sdjcw13@gmail.com>
Date: Wed, 4 Nov 2015 17:19:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?logs=20=E5=91=BD=E4=BB=A4=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=20env=20=E5=8F=82=E6=95=B0=EF=BC=8C=E8=83=BD=E5=A4=9F=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E5=90=8C=E7=8E=AF=E5=A2=83=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/avoscloud    | 11 ++++++++++-
 bin/commander.js |  1 +
 bin/run.js       |  8 ++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/bin/avoscloud b/bin/avoscloud
index c57a457..2038d96 100755
--- a/bin/avoscloud
+++ b/bin/avoscloud
@@ -112,8 +112,17 @@ if(CMD) {
       break;
 
     case 'logs':
+      var prod;
+      if (program.env === 'prod') {
+        prod = 1;
+      } else if (program.env === 'stg') {
+        prod = 0;
+      } else {
+        console.log("请使用：avoscloud logs -e <prod|stg> 查询指定环境的日志");
+        process.exit(1);
+      }
       run.logProjectHome();
-      run.viewCloudLog(program.lines, program.tailf, null, callback);
+      run.viewCloudLog(program.lines, program.tailf, prod, null, callback);
       break;
 
     case "upload":
diff --git a/bin/commander.js b/bin/commander.js
index 707ebfa..1069766 100644
--- a/bin/commander.js
+++ b/bin/commander.js
@@ -32,6 +32,7 @@ exports.parse_args = function(argv){
       .option('-o, --log <log>', '本次部署的提交日志，仅对从本地部署有效。')
       .option('-n, --lines <lines>', '查看多少行最新的云代码日志，默认 10 行。', 10)
       .option('-t, --tailf', '自动刷新云代码日志，结合 logs 命令使用。', 1)
+      .option('-e, --env <prod|stg>', '查看 prod 环境日志或 stg 环境，默认 prod 环境。', 'prod')
       .option('-r, --revision <revision>', 'git 的版本号，仅对从 git 仓库部署有效。')
       .option('-P, --port <port>', '指定本地调试的端口，默认 3000。', 3000)
       .parse(argv);
diff --git a/bin/run.js b/bin/run.js
index 9593e50..dbde5c9 100755
--- a/bin/run.js
+++ b/bin/run.js
@@ -432,19 +432,19 @@ function outputLogs(resp) {
     if (resp && resp.length > 0) {
         resp.reverse().forEach(function(log) {
             var time = new Date(log.time).toLocaleString();
-            var env = log.production == 1 ? 'PROD' : 'TEST';
+            var env = log.production == 1 ? 'PROD' : 'STG';
             var content = log.content.replace(/\n$/, '');
             console.log('%s [%s] [%s] %s', time, env, log.level.toLocaleUpperCase(), content);
         });
     }
 }
 
-exports.viewCloudLog = function (lines, tailf, lastLogUpdatedTime, cb) {
+exports.viewCloudLog = function (lines, tailf, prod, lastLogUpdatedTime, cb) {
     initAVOSCloudSDK(function() {
         var doViewCloudLog = function doViewCloudLog(lines, tailf, lastLogUpdatedTime, cb) {
-            var url = 'tables/EngineLogs';
+            var url = 'tables/EngineLogs?production=' + prod;
             if (lastLogUpdatedTime) {
-              url += '?since=' + encodeURIComponent(lastLogUpdatedTime);
+              url += '&since=' + encodeURIComponent(lastLogUpdatedTime);
             }
             util.requestCloud(url, {}, 'GET', {
                 success: function(resp) {

From 5c66d73ff556330d506d55c21b9efb9cc76da0d1 Mon Sep 17 00:00:00 2001
From: wchen <sdjcw13@gmail.com>
Date: Fri, 6 Nov 2015 11:11:45 +0800
Subject: [PATCH 2/2] review update

---
 bin/avoscloud | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/bin/avoscloud b/bin/avoscloud
index 2038d96..a7cc937 100755
--- a/bin/avoscloud
+++ b/bin/avoscloud
@@ -112,12 +112,8 @@ if(CMD) {
       break;
 
     case 'logs':
-      var prod;
-      if (program.env === 'prod') {
-        prod = 1;
-      } else if (program.env === 'stg') {
-        prod = 0;
-      } else {
+      var prod = ["stg", "prod"].indexOf(program.env);
+      if (prod < 0) {
         console.log("请使用：avoscloud logs -e <prod|stg> 查询指定环境的日志");
         process.exit(1);
       }