Fixed request web timeout (10 to 30 sec)

Fixed job query count in web (30 to 5)
Signed-off-by: Sungmin Kim <dev.sungmin.kim@samsung.com>
Change-Id: I7d0c55d17445465b92a5134992aff61d7524475e

diff --git a/dibs-web/app/controllers/jobs_controller.rb b/dibs-web/app/controllers/jobs_controller.rb
index 2f915b399b3ba230aa93edd8c25531023c1a20ab..624910479fe3106cb5391372f683cd3997c5226d 100644 (file)
--- a/dibs-web/app/controllers/jobs_controller.rb
+++ b/dibs-web/app/controllers/jobs_controller.rb
@@ -30,7 +30,7 @@ class JobsController < ApplicationController
 
        before_filter :check_login_status
 
-       QUERY_CNT = 30
+       QUERY_CNT = 5
 
        def list
        end

diff --git a/dibs-web/public/javascripts/dibs-api.js b/dibs-web/public/javascripts/dibs-api.js
index 70d601efcb95a8950eaf0a6ef07949ff1d3ecca1..19039383bc9c7538e5b50a5c040c6df523862f54 100644 (file)
--- a/dibs-web/public/javascripts/dibs-api.js
+++ b/dibs-web/public/javascripts/dibs-api.js
@@ -296,7 +296,7 @@ function getInfoFromServer(url, successFunction) {
                url: baseUrl+url,
                type: 'GET',
                dataType: 'xml',
-               timeout: 10000,
+               timeout: 30000,
                beforeSend: function() { $.mobile.showPageLoadingMsg(); }, //Show spinner
                complete: function() { $.mobile.hidePageLoadingMsg() }, //Hide spinner
                success: function(xml) {
@@ -314,7 +314,7 @@ function getInfoFromServerNoPreProcess(url, successFunction) {
                url: baseUrl+url,
                type: 'GET',
                dataType: 'xml',
-               timeout: 10000,
+               timeout: 30000,
                success: function(xml) {
                        setSessionInfo(xml);
                        successFunction(xml);