[title] Improve query log in web side

diff --git a/build-cli b/build-cli
index 555e9dbd78eb706d545fc33e5ce4273e0bc83d4a..36b6578a6230180fedb723ab822a220402fe4f9b 100755 (executable)
--- a/build-cli
+++ b/build-cli
@@ -313,6 +313,7 @@ begin
                        exit 1
                end
                output = option[:output]
+               flock = "ON"
 
                begin
                        if output.nil? then
@@ -322,11 +323,16 @@ begin
                                        raise RuntimeError, "The output file is already exist."
                                end
                                log = File.open(output, "w")
+                               log.flock(File::LOCK_EX)
                                puts "Started query log, writing to the file \"#{output}\""
                        end
 
                        result = JobLog.monitor(addr[0], addr[1], option[:job].strip) do |line,status,errmsg|
                                log.puts line
+                               if flock.eql? "ON" then
+                                       log.flock(File::LOCK_UN)
+                                       flock = "OFF"
+                               end
                        end
                        if result and not output.nil? then
                                log.puts "=LOG_END"
@@ -337,6 +343,7 @@ begin
                        result = false
                rescue => e
                        puts "ERROR: #{e}"
+                       puts e.backtrace.inspect
                        result = false
                ensure
                        if not output.nil? then

diff --git a/dibs-web/app/controllers/jobs_controller.rb b/dibs-web/app/controllers/jobs_controller.rb
index 197440b248b652c2118746bc6c3356490102d6b9..37b936e4de6ecea44b29036b4d47a58e38ed879b 100644 (file)
--- a/dibs-web/app/controllers/jobs_controller.rb
+++ b/dibs-web/app/controllers/jobs_controller.rb
@@ -178,11 +178,11 @@ class JobsController < ApplicationController
                end
 
                if(status == "ALL")
-                       status = "'FINISHED', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCELED'"
+                       status = "'FINISHED', 'INITIALIZING', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCELED'"
                elsif(status == "SUCCESS")
                        status = "'FINISHED'"
                elsif(status == "WORKING")
-                       status = "'JUST_CREATE', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
+                       status = "'INITIALIZING', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
                elsif(status == "ERROR")
                        status = "'ERROR', 'CANCELED'"
                end
@@ -277,11 +277,11 @@ class JobsController < ApplicationController
                end
 
                if(status == "ALL")
-                       status = "'FINISHED', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCELED'"
+                       status = "'FINISHED', 'INITIALIZING', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCELED'"
                elsif(status == "SUCCESS")
                        status = "'FINISHED'"
                elsif(status == "WORKING")
-                       status = "'JUST_CREATE', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
+                       status = "'INITIALIZING', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
                elsif(status == "ERROR")
                        status = "'ERROR', 'CANCELED'"
                end
@@ -367,11 +367,11 @@ class JobsController < ApplicationController
                end
 
                if(status == "ALL")
-                       status = "'FINISHED', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCELED'"
+                       status = "'FINISHED', 'INITIALIZING', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCELED'"
                elsif(status == "SUCCESS")
                        status = "'FINISHED'"
                elsif(status == "WORKING")
-                       status = "'JUST_CREATE', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
+                       status = "'INITIALIZING', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
                elsif(status == "ERROR")
                        status = "'ERROR', 'CANCELED'"
                end
@@ -558,6 +558,7 @@ class JobsController < ApplicationController
                if not File.exist?(path) then
                        #if file does not exist then execute query-log command
                        Utils.sbi_query_log_command(id, path)
+                       sleep(1)
                        conti = 1
                else
                        start_line = line 

diff --git a/dibs-web/public/index.html b/dibs-web/public/index.html
index 529363d7d33d827daebe4c34b57d605243e80d8d..597bad75c23687ed62fca158742fc8ccc7100a22 100644 (file)
--- a/dibs-web/public/index.html
+++ b/dibs-web/public/index.html
@@ -100,7 +100,7 @@ Contributors:
                <div data-role="content">
                        <form id="login-form">
                                <label for="login-form-email" >Email</label>
-                               <input id="login-form-email" type="email" name="email"/>
+                               <input id="login-form-email" type="email" name="email" autocomplete="on"/>
                                <label for="login-form-password">Password</label>
                                <input id="login-form-password" type="password" name="password"/>
                                <br/>

diff --git a/dibs-web/public/javascripts/log.js b/dibs-web/public/javascripts/log.js
index be17b7a55ead7e6f92b93b96ec26371c6468adf4..b5f067703ff6bc66b780030950b7f0b9871081d7 100644 (file)
--- a/dibs-web/public/javascripts/log.js
+++ b/dibs-web/public/javascripts/log.js
@@ -128,12 +128,13 @@ function queryLog()
 }
 
 function autoQueryLog(conti, working_status) {
-       if(conti && stop) {
-               queryLog();
-       }
-       else if(working_status == 1 && stop) {
+       if(working_status == 1 && stop) {
                console.log("status is working. try request");
-               setTimeout(function(){queryLog()}, 3000);
+               setTimeout(function(){queryLog()}, 1000);
+       }
+       else if(conti && stop) {
+               console.log("contiue request");
+               setTimeout(function(){queryLog()}, 100);
        }
 }