Update log management, add custom log file...

Conflicts:
	slapos/runner/views.py

slapos/runner/static/css/styles.css

@@ -94,7 +94,7 @@ body {
   font-size: 1.08em;
   color: #2D73B1;
 }
-#running p.instance{
+#running p.software{
   border-left: 4px solid #1E73BD;
 }
 #running img{
@@ -476,12 +476,11 @@ padding: 10px;height: 80px;padding-bottom:15px;}
 }
 .log_info_box h2{
   font-weight: bold;
-  padding: 5px;
+  padding: 2px;
   padding-left: 20px;
   text-align: left;
   color: #fff;
   display: block;
-  height: 20px;
   font-size: 16px;
   margin-top: 20px;
 }
@@ -489,20 +488,26 @@ padding: 10px;height: 80px;padding-bottom:15px;}
   margin-top: 0;
 }
 
-.log_info_box h2.software{
+.log_info_box h2.software, h2.boxtitle{
   background: #1E73BD;
 }
 .log_info_box h2.instance{
   background: #C753C4;
 }
+.log_info_box ul li{padding: 5px; font-size: 14px;color: #777B7C; font-weight: bold; margin: 3px 0; cursor: pointer;border: 1px solid #fff}
+.log_info_box ul li:hover{background: #EBEBEB}
+.log_info_box ul li.checked{border: 1px solid #DADADA}
+.add_btn{background: url(../images/plus.png) center left no-repeat; display: block; margin: 2px; opacity: 0.6; min-width:22px; height: 22px;
+    text-indent: 30px; font-weight: bold; padding-top: 7px;}
+.add_btn:hover{opacity: 1;}
 
-#sr_run_state, #instance_run_state{
+#software_run_state, #instance_run_state{
   color: #000;
   font-weight: bold;
   margin-bottom: 10px;
 }
-#sr_run_state p, #instance_run_state p{
-  padding-top: 3px;
+#software_run_state p, #instance_run_state p{
+  padding-top: 2px;
   font-size: 16px;
 
 }

slapos/runner/static/js/scripts/process.js

@@ -10,10 +10,10 @@
 var url = $SCRIPT_ROOT + "/slapgridResult";
 var currentState = false;
 var running = true;
-var $current;
 var processType = "";
 var currentProcess;
 var sendStop = false;
+var forcedStop = false;
 var processState = "Checking"; //define slapgrid running state
 var openedlogpage = ""; //content software or instance if the current page is software or instance log, otherwise nothing
 var logReadingPosition = 0;
@@ -56,7 +56,7 @@ function getRunningState() {
         log_info = "",
         param = {
             position: logReadingPosition,
-            log: (processState !== "Checking" && openedlogpage === processType.toLowerCase()) ? openedlogpage : ""
+            log: (processState !== "Checking" && openedlogpage !== "") ? processType.toLowerCase() : ""
         },
         jqxhr = $.post(url, param, function (data) {
             setRunningState(data);
@@ -75,6 +75,8 @@ function getRunningState() {
             if (running && processState === "Checking" && openedlogpage !== "") {
                 $("#salpgridLog").show();
                 $("#manualLog").hide();
+                $("#slapstate").show();
+                $("#openloglist").hide();
             }
             processState = running ? "Running" : "Stopped";
             currentLogSize += parseInt(size, 10);
@@ -107,7 +109,7 @@ function stopProcess() {
         var urlfor = $SCRIPT_ROOT + "stopSlapgrid",
             type = "slapgrid-sr";
 
-        if ($("#instrun").text() === "Stop instance") {
+        if (processType === "Instance") {
             type = "slapgrid-cp";
         }
         $.post(urlfor, {type: type}, function (data) {
@@ -121,6 +123,7 @@ function stopProcess() {
             .complete(function () {
                 sendStop = false;
                 processState = "Stopped";
+                forcedStop = true;
             });
     }
 }
@@ -128,29 +131,50 @@ function stopProcess() {
 function bindRun() {
     "use strict";
     $("#softrun").click(function () {
-        if ($("#softrun").text() === "Stop software") {
+        if ($(this).hasClass('slapos_stop')) {
             stopProcess();
         } else {
             if (!isRunning()) {
                 setCookie("slapgridCMD", "Software");
-                window.location.href = $SCRIPT_ROOT + "/viewSoftwareLog";
+                window.location.href = $SCRIPT_ROOT + "/viewLog";
             }
         }
         return false;
     });
     $("#instrun").click(function () {
-        if ($("#instrun").text() === "Stop instance") {
+        if ($("#softrun").hasClass('slapos_stop')) {
             stopProcess();
         } else {
             if (!isRunning()) {
                 setCookie("slapgridCMD", "Instance");
-                window.location.href = $SCRIPT_ROOT + "/viewInstanceLog";
+                window.location.href = $SCRIPT_ROOT + "/viewLog";
             }
         }
         return false;
     });
 }
 
+function updateStatus(elt, val) {
+  "use strict";
+  var src = '#' + elt + '_run_state', value = 'state_' + val;
+  $(src).removeClass();
+  $(src).addClass(value);
+  switch (val) {
+    case "waiting":
+      $(src).children('p').text("Waiting for starting");
+      break;
+    case "stopped":
+      $(src).children('p').text("Stopped by user");
+      break;
+    case "terminated":
+      $(src).children('p').text("Complete");
+      break;
+    case "running":
+      $(src).children('p').text("Processing");
+      break;
+  }
+}
+
 function setRunningState(data) {
     "use strict";
     if (data.result) {
@@ -159,31 +183,45 @@ function setRunningState(data) {
             running = true;
             //change run menu title and style
             if (data.software) {
-                $("#softrun").empty();
-                $("#softrun").append("Stop software");
-                $("#softrun").css("color", "#0271BF");
-                $current = $("#softrun");
+                if ( $("#running").children('span').length === 0 ) {
+                  $("#softrun").removeClass('slapos_run');
+                  $("#softrun").addClass('slapos_stop');
+                  $("#running img").before('<p id="running_info" class="software">Building software...</p>');
+                }
                 processType = "Software";
             }
             if (data.instance) {
-                $("#instrun").empty();
-                $("#instrun").append("Stop instance");
-                $("#instrun").css("color", "#0271BF");
-                $current = $("#instrun");
+              ///Draft!!
+                if ( $("#running").children('span').length === 0 ) {
+                  $("#softrun").removeClass('slapos_run');
+                  $("#softrun").addClass('slapos_stop');
+                  $("#running img").before('<p id="running_info" class="instance">Running instance...</p>');
+                }
                 processType = "Instance";
             }
         }
     } else {
+        if ( $("#running").is(":visible") ) {
+          $("#error").Popup("Slapgrid finished running your " + processType + " Profile", {type: 'info', duration: 3000});
+          if ( forcedStop ) {
+            updateStatus('instance', 'stopped');
+            updateStatus('software', 'stopped');
+          }
+          else {
+            updateStatus(processType.toLowerCase(), 'terminated');
+          }
+          //Update window!!!
+          $("#slapswitch").attr('rel', 'opend');
+          $("#slapswitch").text('Access application');
+        }
         $("#running").hide();
         running = false; //nothing is currently running
-        if ($current !== undefined) {
-            $current.empty();
-            $current.append("Run " + processType.toLowerCase());
-            $current.css("color", "#275777");
-            $current = undefined;
-            currentState = false;
-            $("#error").Popup("Slapgrid finished running your " + processType + " Profile", {type: 'info', duration: 3000});
+        $("#softrun").removeClass('slapos_stop');
+        $("#softrun").addClass('slapos_run');
+        if ( $("#running").children('span').length > 0 ) {
+          $("#running").children('p').remove();
         }
+        currentState = false;
     }
     currentState = data.result;
 }
@@ -197,6 +235,9 @@ function runProcess(urlfor, data) {
             .error(function () {
                 $("#error").Popup("Failled to run Slapgrid", {type: 'error', duration: 3000});
             });
+        if ( $("#running_info").children('span').length > 0 ) {
+          $("#running_info").children('p').remove();
+        }
         setRunningState(data);
         setTimeout(getRunningState, 6000);
     }
@@ -208,14 +249,19 @@ function checkSavedCmd() {
     if (!result) {
         return false;
     }
+    forcedStop = false;
     if (result === "Software") {
         running = false;
         runProcess(($SCRIPT_ROOT + "/runSoftwareProfile"),
                    {result: true, instance: false, software: true});
+        updateStatus('software', 'running');
+        updateStatus('instance', 'waiting');
     } else if (result === "Instance") {
         running = false;
         runProcess(($SCRIPT_ROOT + "/runInstanceProfile"),
                    {result: true, instance: true, software: false});
+        updateStatus('software', 'terminated');
+        updateStatus('instance', 'running');
     }
     deleteCookie("slapgridCMD");
     return (result !== null);

slapos/runner/static/js/scripts/softwareFolder.js

@@ -551,7 +551,7 @@ $(document).ready(function () {
 
     function addToFavourite(filepath){
       var i = favourite_list.length,
-          filename = filepath.replace(/^.*(\\|\/|\:)/, '');;
+          filename = filepath.replace(/^.*(\\|\/|\:)/, '');
       if (i === 0){
         $("#tooltip-filelist ul").empty();
       }

slapos/runner/templates/layout.html

@@ -70,9 +70,7 @@
 	        <div class="line"></div>
           <h2 class="info">{% block title %}{% endblock %} - {{session.title}}</h2>
     	    <div class="run">
-            <div id="running">
-              <p id="running_info" class='software'>Building software...</p>
-              <!--<p id="running_info" class='instance'>Running instance...</p>-->
+            <div id="running" style="display:none">
               <img alt="" src="{{ url_for('static', filename='images/ajax_roller.gif') }}" height='26' title="slapgrid is currently running"/>
               <div class="clear"></div>
             </div>
@@ -82,8 +80,8 @@
           <ul class="sf-menu">
             <li><a href="{{ url_for('editCurrentProject') }}">Editor</a></li>
             <li><a href="{{ url_for('inspectInstance') }}">Services</a></li>
-            <li><a href="{{ url_for('viewInstanceLog') }}">Logs</a></li>
-            <li><a href="{{ url_for('viewSoftwareLog') }}">Terminal</a></li>
+            <li><a href="{{ url_for('viewLog') }}">Logs</a></li>
+            <li><a href="{{ url_for('viewLog') }}">Terminal</a></li>
             <li><a href="{{ url_for('manageRepository')}}#tab2">Git</a></li>
             <li class='right_menu main_menu'><a href="#"></a>
               <ul>
@@ -93,7 +91,7 @@
                 <li><a href="{{ url_for('openProject', method='new')}}">Create Software Release</a></li>
                 <li class='sep'></li>
                 <li><a href="{{ url_for('removeInstance') }}" id="removeIst">Destroy All Services</a></li>
-                <li><a href="{{ url_for('runInstanceProfile') }}">Redeploy Services</a></li>
+                <li><a href="{{ url_for('runInstanceProfile') }}" id="instrun">Redeploy Services</a></li>
                 <li class='sep'></li>
                 <li><a href="{{ url_for('browseWorkspace') }}">Browse Workspace</a></li>
                 <li><a href="{{ url_for('inspectSoftware') }}">My Softwares Releases</a></li>
@@ -101,7 +99,7 @@
                 <li><a href="{{ url_for('dologout') }}">Log out</a></li>
              </ul>
             </li>
-            <li class='right_menu slapos_run'><a href="{{ url_for('runSoftwareProfile') }}" id="instrun"></a>
+            <li class='right_menu slapos_run' id="softrun"><a href="{{ url_for('runSoftwareProfile') }}"></a>
             <!--<li class='right_menu slapos_top'><a href="{{ url_for('runInstanceProfile') }}" id="instrun"></a>-->
             </li>
           </ul>

slapos/runner/templates/viewLog.html

 {% extends "layout.html" %}
-{% block title %}View {{ type }} log{% endblock %}
+{% block title %}View log{% endblock %}
 {% block head %}
   {{ super() }}
   <script src="{{ url_for('static', filename='js/scripts/viewlog.js') }}" type="text/javascript" charset="utf-8"></script>
+  <link href="{{ url_for('static', filename='css/ui.fancytree.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
+  <script src="{{ url_for('static', filename='js/jquery/jquery.fancytree.min.js') }}" type="text/javascript" charset="utf-8"></script>
+  <link href="{{ url_for('static', filename='css/colorbox.css', _external=False) }}" rel="stylesheet" type="text/css" media="screen" />
+  <script src="{{ url_for('static', filename='js/jquery/jquery.colorbox-min.js') }}" type="text/javascript" charset="utf-8"></script>
 {% endblock %}
 {% block body %}
-<input type="hidden" name="type" value="{{type}}" id="type" />
-<h2 class="hight hide" id="logheader">Slapgrid result for {{ type }}</h2>
+
+
+<h2 class="hight hide" id="logheader">Inspecting current slapgrid log - Click for more options</h2>
 <div class="log_btn" id="logconfigbox" style="display:none">
 <span style="margin-left:15px; font-size: 18px;"> Update parameters </span>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -20,37 +25,67 @@
 <div class='space'></div>
 <div class="log_content">
   <div class="log" id="salpgridLog"></div>
-  <textarea class="log" readonly id="manualLog" style="display:none">{{result}}</textarea>
+  <div class="log" id="manualLog" style="display:none"></div>
 </div>
 <div class="log_information">
   <div class="log_info_box">
-    <h2 class="software">Building State</h2>
-    <div class="log_content_box">
-      <div id="sr_run_state" class="state_running">
-        <span class="legend"></span>
-        <p>Processing</p>
-        <div class="clear"></div>
+    <div id="slapstate">
+      <h2 class="software">Building State</h2>
+      <div class="log_content_box">
+        <div id="software_run_state" class="state_running">
+          <span class="legend"></span>
+          <p>Processing</p>
+          <div class="clear"></div>
+        </div>
+        <p>SlapOS rebuild your software from source, allowing you to easily patch or add any free software. <a href="#">Lean how!</a></p>
       </div>
-      <p>SlapOS rebuild your software from source, allowing you to easily patch or add any free software. <a href="#">Lean how!</a></p>
-    </div>
 
-    <h2 class="instance">Running State</h2>
-    <div class="log_content_box">
-      <!--<div id="instance_run_state" class="state_terminated">-->
-      <!--<div id="instance_run_state" class="state_stopped">-->
-      <div id="instance_run_state" class="state_waiting">
-        <span class="legend"></span>
-        <p>Waiting for starting</p>
-        <div class="clear"></div>
+      <h2 class="instance">Running State</h2>
+      <div class="log_content_box">
+        <!--<div id="instance_run_state" class="state_terminated">-->
+        <!--<div id="instance_run_state" class="state_stopped">-->
+        <div id="instance_run_state" class="state_waiting">
+          <span class="legend"></span>
+          <p>Waiting for starting</p>
+          <div class="clear"></div>
+        </div>
+        <p>SlapOS configure your running environment to match your needs. <a href="#">Lean how!</a></p>
       </div>
-      <p>SlapOS configure your running environment to match your needs. <a href="#">Lean how!</a></p>
-    </div>
 
-    <div class="separator"></div>
-    <div style="height: 38px; text-align: center; padding-top: 25px;">
-      <a href="#" id="switch" class="lshare" rel="stop">STOP PROCESS</a>
+      <div class="separator"></div>
+      <div style="height: 38px; text-align: center; padding-top: 25px;">
+        <a href="#" id="slapswitch" class="lshare" rel="stop">STOP PROCESS</a>
+      </div>
+    </div>
+    <div id="openloglist">
+      <h2 class="boxtitle">Select log file to view</h2>
+      <div style="height: 340px; margin-bottom: 10px;">
+        <div id='addbox' style="display:none">
+          <a href="#inline_content" id="inlineViewer" class="add_btn">ADD FILE</a>
+          <div class="separator"></div>
+        </div>
+        <ul>
+          <li rel='software.log'>Software.log</li>
+          <li rel='instance.log' class='checked'>Instance.log</li>
+        </ul>
+      </div>
+      <div class="separator"></div>
+      <div style="height: 38px; text-align: left; padding: 20px 0 0 15px;">
+        <a id="logEdit" class="lshare no-right-border" style="float:left">Edit list</a>
+        <a id="refreshlog" class="lshare" style="float:left">Refresh log</a>
+      </div>
     </div>
   </div>
 </div>
 <div class='clear'></div>
+
+<!-- This contains the hidden content for inline calls -->
+<div style='display:none'>
+  <div id='inline_content' style='padding:10px; background:#fff;'>
+    <div style='border: solid 1px #678dad; height: 300px; overflow: auto;'>
+      <div id="fileTree"></div>
+    </div>
+    <input type=submit value="Add file" id="addfile" class="button">
+  </div>
+</div>
 {% endblock %}

slapos/runner/views.py

@@ -144,15 +144,6 @@ def runSoftwareProfile():
     return jsonify(result=False)
 
 
-def viewSoftwareLog():
-  if os.path.exists(app.config['software_log']):
-    result = tail(open(app.config['software_log']), lines=1500)
-  else:
-    result = 'Not found yet'
-  return render_template('viewLog.html', type='software',
-      result=result.encode("utf-8"))
-
-
 # instance views
 def editInstanceProfile():
   profile = getProfilePath(app.config['etc_dir'], app.config['instance_profile'])
@@ -217,13 +208,37 @@ def runInstanceProfile():
     return jsonify(result=False)
 
 
+<<<<<<< HEAD
 def viewInstanceLog():
   if os.path.exists(app.config['instance_log']):
     result = open(app.config['instance_log']).read()
+=======
+@login_required()
+def viewLog():
+  return render_template('viewLog.html')
+
+@login_required()
+def getFileLog():
+  logfile = request.form.get('filename', '').encode('utf-8')
+  if logfile == "instance.log":
+    file_path = app.config['instance_log']
+  elif logfile == "software.log":
+    file_path = app.config['software_log']
+>>>>>>> 7beebdd... Update log management, add custom log file...
   else:
-    result = 'Not found yet'
-  return render_template('viewLog.html', type='instance',
-      result=result.encode("utf-8"))
+    file_path = realpath(app.config, logfile)
+  try:
+    if not isText(file_path):
+      return jsonify(code=0,
+            result="Can not open binary file, please select a text file!")
+    if 'truncate' in request.form:
+      content = tail(open(file_path), int(request.form['truncate']))
+      return jsonify(code=1, result=content)
+    else:
+      with open(file_path) as f:
+        return jsonify(code=1, result=f.read())
+  except:
+    return jsonify(code=0, result="Warning: Log file doesn't exist yet or empty log!!")
 
 
 def stopAllPartition():
@@ -349,12 +364,13 @@ def getFileContent():
 
 
 def saveFileContent():
-  file_path = realpath(app.config, request.form['file'])
+  file_path = realpath(app.config, request.form['file'], False)
   if file_path:
-    open(file_path, 'w').write(request.form['content'].encode("utf-8"))
+    with open(file_path, 'w') as f:
+      f.write(request.form['content'].encode("utf-8"))
     return jsonify(code=1, result="")
   else:
-    return jsonify(code=0, result="Error: No such file!")
+    return jsonify(code=0, result="Rejected!! Cannot access to this location.")
 
 
 def changeBranch():
@@ -657,8 +673,6 @@ app.add_url_rule('/inspectSoftware', 'inspectSoftware', inspectSoftware)
 app.add_url_rule('/removeSoftware', 'removeSoftware', removeSoftware)
 app.add_url_rule('/runSoftwareProfile', 'runSoftwareProfile',
                  runSoftwareProfile, methods=['GET', 'POST'])
-app.add_url_rule('/viewSoftwareLog', 'viewSoftwareLog',
-                 viewSoftwareLog, methods=['GET'])
 app.add_url_rule('/editInstanceProfile', 'editInstanceProfile',
                  editInstanceProfile)
 app.add_url_rule('/inspectInstance', 'inspectInstance',
@@ -668,8 +682,10 @@ app.add_url_rule('/supervisordStatus', 'supervisordStatus',
 app.add_url_rule('/runInstanceProfile', 'runInstanceProfile',
                  runInstanceProfile, methods=['GET', 'POST'])
 app.add_url_rule('/removeInstance', 'removeInstance', removeInstance)
-app.add_url_rule('/viewInstanceLog', 'viewInstanceLog',
-                 viewInstanceLog, methods=['GET'])
+app.add_url_rule('/viewLog', 'viewLog',
+                 viewLog, methods=['GET'])
+app.add_url_rule("/getFileLog", 'getFileLog', getFileLog,
+                 methods=['POST'])
 app.add_url_rule('/stopAllPartition', 'stopAllPartition',
                  stopAllPartition, methods=['GET'])
 app.add_url_rule('/tailProcess/name/<process>', 'tailProcess',