mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed debugging from live log

Browse Source
This commit is contained in:
Martin 2013-10-29 23:35:53 +01:00
parent daed74a0f2
commit 0c0e71f750
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
urbackupserver/www/templates.js
View File

@ -61,7 +61,7 @@ tmpls.nospc_fatal=new Template("<table cellspacing=\"0\" cellpadding=\"0\">\r\n<
tmpls.status_percent_done=new Template("<div style=\"width: 100%; border: 1px solid black;\">\r\n\t<div style=\"width: #{pcdone}%;background-image: url(progress.png); background-repeat:repeat-x;height:15px\">\r\n\t</div>\r\n</div>");
tmpls.status_client_download=new Template("<h3>#{tClient download}</h3>\r\n\r\n<select size=\"1\" style=\"width: 150px;\" id=\"download_client\">\r\n#{download_clients}\r\n</select>\r\n<input type=\"button\" value=\"#{tDownload}\" onclick=\"downloadClient(#{clientid})\" />");
tmpls.new_version_available=new Template("#{tThere is a new version of UrBackup server available} (#{new_version_number}). Download it <a href=\"http://www.urbackup.org/Download.php\">here</a>.<br/><br/>");
tmpls.live_log=new Template("<html style=\"height: 100%\">\r\n<head>\r\n<title>#{tUrBackup live log:} #{clientname}</title>\r\n<script language=\"JavaScript\" src=\"prototype.js\"></script>\r\n<script language=\"JavaScript\" src=\"templates.js\"></script>\r\n<script language=\"JavaScript\" src=\"urbackup_functions.js\"></script>\r\n<script type=\"text/javascript\">\r\n//<!--\r\nif(!window.g)\r\n\twindow.g=new Object();\r\n\t\r\ng.session=\"#{session}\";\r\ng.max_log_id=-1;\r\ng.clientid=#{clientid};\r\ng.live_log_rows=0;\r\ng.max_live_log_rows=500;\r\n\r\ng.refresh_log = function()\r\n{\r\n\tvar lastid=\"\";\r\n\tif(g.max_log_id>0)\r\n\t{\r\n\t\tlastid=\"&lastid=\"+g.max_log_id;\r\n\t}\r\n\tnew getJSON(\"livelog\", \"clientid=\"+g.clientid+lastid, refresh_log2);\r\n}\r\n\r\nfunction refresh_log2(data)\r\n{\r\n\tvar new_data=\"\";\r\n\tfor(var i=0;i<data.logdata.length;++i)\r\n\t{\r\n\t\tvar obj=data.logdata[i];\r\n\t\tif(obj.id>g.max_log_id)\r\n\t\t{\r\n\t\t\tvar d=new Date(obj.time*1000);\r\n\t\t\tvar s_loglevel=\"\";\r\n\t\t\tvar background_color=\"\";\r\n\t\t\t\r\n\t\t\tif(obj.loglevel==1)\r\n\t\t\t\tbackground_color=\"background-color: yellow\";\r\n\t\t\telse if(obj.loglevel==2)\r\n\t\t\t\tbackground_color=\"background-color: red\";\r\n\t\t\t\t\r\n\t\t\tswitch(obj.loglevel)\r\n\t\t\t{\r\n\t\t\tcase -1: s_loglevel=\"DEBUG\"; break;\r\n\t\t\tcase 0: s_loglevel=\"INFO\"; break;\r\n\t\t\tcase 1: s_loglevel=\"WARNING\"; break;\r\n\t\t\tcase 2: s_loglevel=\"ERROR\"; break;\r\n\t\t\t}\r\n\t\t\tnew_data+=tmpls.live_log_row.evaluate({time: format_date(d), loglevel: s_loglevel, message: obj.msg, background_color: background_color});\r\n\t\t\t\r\n\t\t\tg.max_log_id=obj.id;\r\n\t\t\t++g.live_log_rows;\r\n\t\t}\r\n\t}\r\n\t\r\n\tvar deleted_height=0;\r\n\tif(g.live_log_rows>g.max_live_log_rows)\r\n\t{\r\n\t\tvar deleted_height_start=I('logdata').rows[g.live_log_rows-g.max_live_log_rows].getBoundingClientRect().bottom;\r\n\t\twhile(g.live_log_rows>g.max_live_log_rows && I('logdata').rows.length>0)\r\n\t\t{\r\n\t\t\tI('logdata').deleteRow(0);\r\n\t\t\t--g.live_log_rows;\r\n\t\t}\r\n\t\r\n\t\tdeleted_height=deleted_height_start-I('logdata').rows[0].getBoundingClientRect().bottom;\r\n\t}\r\n\t\r\n\tif(new_data.length>0)\r\n\t{\r\n\t\tvar is_at_bottom=false;\r\n\t\t\r\n\t\tvar body = document.body,\r\n\t\t\thtml = document.documentElement;\r\n\r\n\t\tvar height = Math.max( body.scrollHeight, body.offsetHeight, \r\n\t\t\t\t\t\t\t html.clientHeight, html.scrollHeight, html.offsetHeight );\r\n\t\t\t\t\t\t\t \r\n\t\t\r\n\t\tif(window.pageYOffset + window.innerHeight > height-20)\r\n\t\t{\r\n\t\t\tis_at_bottom=true;\r\n\t\t}\r\n\t\r\n\t\tif(I('logdata').tBodies.length>0)\r\n\t\t{\r\n\t\t\tI('logdata').tBodies[0].innerHTML+=new_data;\r\n\t\t}\r\n\t\telse\r\n\t\t{\r\n\t\t\tI('logdata').innerHTML+=new_data;\r\n\t\t}\r\n\t\t\r\n\t\tif(is_at_bottom)\r\n\t\t{\r\n\t\t\twindow.scrollTo(window.pageXOffset, window.pageYOffset + window.innerHeight);\r\n\t\t}\r\n\t\telse if(window.pageYOffset-deleted_height>0 && deleted_height>0)\r\n\t\t{\r\n\t\t\tconsole.log(\"window.pageYOffset=\"+window.pageYOffset+\" deleted_height=\"+deleted_height);\r\n\t\t\twindow.scrollTo(window.pageXOffset, window.pageYOffset-deleted_height);\r\n\t\t}\r\n\t}\r\n\t\r\n\tg.refresh_log();\r\n}\r\n//-->\r\n</script>\r\n</head>\r\n<body onload=\"g.refresh_log()\" style=\"height: 100%\">\r\n<div style=\"height: 100%; position: absolute; left: 0px; top: 0px\">&nbsp;</div>\r\n<table style=\"border: 0px\" id=\"logdata\" style=\"height: 100%\">\r\n\r\n</table>\r\n<img src=\"indicator.gif\" />\r\n</body>\r\n</html> ");
tmpls.live_log=new Template("<html style=\"height: 100%\">\r\n<head>\r\n<title>#{tUrBackup live log:} #{clientname}</title>\r\n<script language=\"JavaScript\" src=\"prototype.js\"></script>\r\n<script language=\"JavaScript\" src=\"templates.js\"></script>\r\n<script language=\"JavaScript\" src=\"urbackup_functions.js\"></script>\r\n<script type=\"text/javascript\">\r\n//<!--\r\nif(!window.g)\r\n\twindow.g=new Object();\r\n\t\r\ng.session=\"#{session}\";\r\ng.max_log_id=-1;\r\ng.clientid=#{clientid};\r\ng.live_log_rows=0;\r\ng.max_live_log_rows=500;\r\n\r\ng.refresh_log = function()\r\n{\r\n\tvar lastid=\"\";\r\n\tif(g.max_log_id>0)\r\n\t{\r\n\t\tlastid=\"&lastid=\"+g.max_log_id;\r\n\t}\r\n\tnew getJSON(\"livelog\", \"clientid=\"+g.clientid+lastid, refresh_log2);\r\n}\r\n\r\nfunction refresh_log2(data)\r\n{\r\n\tvar new_data=\"\";\r\n\tfor(var i=0;i<data.logdata.length;++i)\r\n\t{\r\n\t\tvar obj=data.logdata[i];\r\n\t\tif(obj.id>g.max_log_id)\r\n\t\t{\r\n\t\t\tvar d=new Date(obj.time*1000);\r\n\t\t\tvar s_loglevel=\"\";\r\n\t\t\tvar background_color=\"\";\r\n\t\t\t\r\n\t\t\tif(obj.loglevel==1)\r\n\t\t\t\tbackground_color=\"background-color: yellow\";\r\n\t\t\telse if(obj.loglevel==2)\r\n\t\t\t\tbackground_color=\"background-color: red\";\r\n\t\t\t\t\r\n\t\t\tswitch(obj.loglevel)\r\n\t\t\t{\r\n\t\t\tcase -1: s_loglevel=\"DEBUG\"; break;\r\n\t\t\tcase 0: s_loglevel=\"INFO\"; break;\r\n\t\t\tcase 1: s_loglevel=\"WARNING\"; break;\r\n\t\t\tcase 2: s_loglevel=\"ERROR\"; break;\r\n\t\t\t}\r\n\t\t\tnew_data+=tmpls.live_log_row.evaluate({time: format_date(d), loglevel: s_loglevel, message: obj.msg, background_color: background_color});\r\n\t\t\t\r\n\t\t\tg.max_log_id=obj.id;\r\n\t\t\t++g.live_log_rows;\r\n\t\t}\r\n\t}\r\n\t\r\n\tvar deleted_height=0;\r\n\tif(g.live_log_rows>g.max_live_log_rows)\r\n\t{\r\n\t\tvar deleted_height_start=I('logdata').rows[g.live_log_rows-g.max_live_log_rows].getBoundingClientRect().bottom;\r\n\t\twhile(g.live_log_rows>g.max_live_log_rows && I('logdata').rows.length>0)\r\n\t\t{\r\n\t\t\tI('logdata').deleteRow(0);\r\n\t\t\t--g.live_log_rows;\r\n\t\t}\r\n\t\r\n\t\tdeleted_height=deleted_height_start-I('logdata').rows[0].getBoundingClientRect().bottom;\r\n\t}\r\n\t\r\n\tif(new_data.length>0)\r\n\t{\r\n\t\tvar is_at_bottom=false;\r\n\t\t\r\n\t\tvar body = document.body,\r\n\t\t\thtml = document.documentElement;\r\n\r\n\t\tvar height = Math.max( body.scrollHeight, body.offsetHeight, \r\n\t\t\t\t\t\t\t html.clientHeight, html.scrollHeight, html.offsetHeight );\r\n\t\t\t\t\t\t\t \r\n\t\t\r\n\t\tif(window.pageYOffset + window.innerHeight > height-20)\r\n\t\t{\r\n\t\t\tis_at_bottom=true;\r\n\t\t}\r\n\t\r\n\t\tif(I('logdata').tBodies.length>0)\r\n\t\t{\r\n\t\t\tI('logdata').tBodies[0].innerHTML+=new_data;\r\n\t\t}\r\n\t\telse\r\n\t\t{\r\n\t\t\tI('logdata').innerHTML+=new_data;\r\n\t\t}\r\n\t\t\r\n\t\tif(is_at_bottom)\r\n\t\t{\r\n\t\t\twindow.scrollTo(window.pageXOffset, window.pageYOffset + window.innerHeight);\r\n\t\t}\r\n\t\telse if(window.pageYOffset-deleted_height>0 && deleted_height>0)\r\n\t\t{\r\n\t\t\twindow.scrollTo(window.pageXOffset, window.pageYOffset-deleted_height);\r\n\t\t}\r\n\t}\r\n\t\r\n\tg.refresh_log();\r\n}\r\n//-->\r\n</script>\r\n</head>\r\n<body onload=\"g.refresh_log()\" style=\"height: 100%\">\r\n<div style=\"height: 100%; position: absolute; left: 0px; top: 0px\">&nbsp;</div>\r\n<table style=\"border: 0px\" id=\"logdata\" style=\"height: 100%\">\r\n\r\n</table>\r\n<img src=\"indicator.gif\" />\r\n</body>\r\n</html> ");
tmpls.live_log_row=new Template("<tr>\r\n\t<td style=\"width: 0%; vertical-align: top\"><span style=\"white-space: nowrap\">#{time}&nbsp;&nbsp;</span></td>\r\n\t<td style=\"width: 0%; vertical-align: top; #{background_color}\"><span style=\"white-space: nowrap\">#{loglevel}&nbsp;&nbsp;</span></td>\r\n\t<td>#{message}</td>\r\n</tr>");
tmpls.database_error=new Template("<table cellspacing=\"0\" cellpadding=\"0\">\r\n<tr>\t\t\t\r\n\t<th style=\"border: 3px solid red; padding: 3px;width: 500px\">#{database_error_text}</th>\r\n</tr>\r\n</table>\r\n<br>\r\n<br>");
tmpls.file_cache_error=new Template("<table cellspacing=\"0\" cellpadding=\"0\">\r\n<tr>\t\t\t\r\n\t<th style=\"border: 3px solid red; padding: 3px;width: 500px\">\r\n\t#{creating_filescache_text} <br />\r\n\t#{tNumber of file entries processed}: #{processed_file_entries}\r\n\t</th>\r\n</tr>\r\n</table>\r\n<br>\r\n<br>");

1
urbackupserver/www/templates/live_log.htm
View File

@ -100,7 +100,6 @@ function refresh_log2(data)
}
else if(window.pageYOffset-deleted_height>0 && deleted_height>0)
{
console.log("window.pageYOffset="+window.pageYOffset+" deleted_height="+deleted_height);
window.scrollTo(window.pageXOffset, window.pageYOffset-deleted_height);
}
}