Add tail -f n implementation for 'runSoftware' logs

slapos/runner/templates/viewLog.html

 {% extends "layout.html" %}
 {% block title %}View {{ type }} log{% endblock %}
 {% block body %}
-Currently running: <span class="message">{{ running }}</span><br>
 <strong>Note:</strong> You can refresh this page from time to time to have updates.<br>
+<h2>Currently running: <span class="message">{{ running }}</span></h2><br>
 <h2>Result for {{ type }}</h2>
 <div class="log_content"><textarea class="log" readonly >{{ result }}</textarea></div>
 {% endblock %}

slapos/runner/utils.py

@@ -219,6 +219,10 @@ def runBuildoutAnnotate(config):
   return False
 
 def svcStopAll(config):
+  #stop all process running in supervisord
+  request = Popen([config['supervisor'], config['configuration_file_path'], 
+                'stop', 'all'])
+  request.wait()
   return Popen([config['supervisor'], config['configuration_file_path'], 
                 'shutdown']).communicate()[0]
 
@@ -257,7 +261,8 @@ def getFolderContent(folder):
   try:
     r=['<ul class="jqueryFileTree" style="display: none;">']
     d=urllib.unquote(folder)
-    for f in os.listdir(d):
+    ldir = sorted(os.listdir(d), key=unicode.lower)
+    for f in ldir:
       if f.startswith('.'): #do not displays this file/folder
 	continue      
       ff=os.path.join(d,f)
@@ -277,7 +282,8 @@ def getFolder(folder):
   try:
     r=['<ul class="jqueryFileTree" style="display: none;">']    
     d=urllib.unquote(folder)
-    for f in os.listdir(d):
+    ldir = sorted(os.listdir(d), key=unicode.lower)
+    for f in ldir:
       if f.startswith('.'): #do not display this file/folder
 	continue
       ff=os.path.join(d,f)
@@ -341,8 +347,7 @@ def checkSoftwareFolder(path, config):
   tmp = path.split('/')
   del tmp[len(tmp) - 1]
   path = string.join(tmp, '/')
-  if os.path.exists(os.path.join(path, config['software_profile'])) and \
-     os.path.exists(os.path.join(path, config['instance_profile'])):
+  if os.path.exists(os.path.join(path, config['software_profile'])):
     return jsonify(result=path)
   return jsonify(result="")
 
@@ -391,3 +396,30 @@ def removeSoftwareByName(config, folderName):
       break
     i = i+1
   return jsonify(code=1, result=data)
+
+def tail(f, lines=20):
+  """
+  Returns the last `lines` lines of file `f`. It is an implementation of tail -f n.
+  """
+  BUFSIZ = 1024
+  f.seek(0, 2)
+  bytes = f.tell()
+  size = lines + 1
+  block = -1
+  data = []
+  while size > 0 and bytes > 0:
+      if bytes - BUFSIZ > 0:
+	  # Seek back one whole BUFSIZ
+	  f.seek(block * BUFSIZ, 2)
+	  # read BUFFER
+	  data.insert(0, f.read(BUFSIZ))
+      else:
+	  # file too small, start from begining
+	  f.seek(0,0)
+	  # only read what was not read
+	  data.insert(0, f.read(bytes))
+      linesFound = data[0].count('\n')
+      size -= linesFound
+      bytes -= BUFSIZ
+      block -= 1
+  return string.join(''.join(data).splitlines()[-lines:], '\n')
\ No newline at end of file

slapos/runner/views.py

@@ -69,7 +69,7 @@ def runSoftwareProfile():
 @app.route('/viewSoftwareLog', methods=['GET'])
 def viewSoftwareLog():
   if os.path.exists(app.config['software_log']):
-    result = open(app.config['software_log'], 'r').read()
+    result = tail(open(app.config['software_log'], 'r'), lines=1500)
   else:
     result = 'Not found yet'
   return render_template('viewLog.html', type='Software',
@@ -87,7 +87,7 @@ def updateSoftwareProfile():
 def editInstanceProfile():
   profile = getProfile(app.config['runner_workdir'], app.config['instance_profile'])
   if profile == "":
-    flash('Error: can not open profile, please select your project first') 
+    flash('Error: can not open instance profile for this Software Release') 
   return render_template('updateInstanceProfile.html',
       profile=profile)