paramecio/pastafari2
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Cleaning in ssh logs and progress appearance

Browse source
This commit is contained in:
absurdo 2023-09-03 17:36:49 +02:00
parent e4905c9769
commit 0c149683ff
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libraries/task.py
View file

@ -480,7 +480,7 @@ class Task:
#self.task.conditions=['WHERE id=%s', [self.id]] #self.task.conditions=['WHERE id=%s', [self.id]]
#self.task.update({'error': 1, 'status': 1}) #self.task.update({'error': 1, 'status': 1})
self.logtask.insert({'task_id': self.id, 'progress': 100, 'message': 'Malformed json code: '+str(line), 'error': 1, 'status': 1, 'server': self.server}) self.logtask.insert({'task_id': self.id, 'progress': 100, 'message': 'Malformed json code: '+str(line).strip(), 'error': 1, 'status': 1, 'server': self.server})
self.make_error_task() self.make_error_task()
return False return False
@ -511,7 +511,7 @@ class Task:
#self.task.conditions=['WHERE id=%s', [self.id]] #self.task.conditions=['WHERE id=%s', [self.id]]
#self.task.update({'error': 0, 'status':0}) #self.task.update({'error': 0, 'status':0})
self.logtask.insert({'task_id': self.id, 'progress': 0, 'no_progress': 1, 'message': str(line), 'error': 0, 'status': 0, 'server': self.server}) self.logtask.insert({'task_id': self.id, 'progress': 0, 'no_progress': 1, 'message': str(line).strip(), 'error': 0, 'status': 0, 'server': self.server})
#return False #return False

2
scripts/system/install_python.sh
View file

@ -107,7 +107,7 @@ sudo /opt/certbot/bin/pip install --upgrade pip
sudo /opt/certbot/bin/pip install certbot certbot sudo /opt/certbot/bin/pip install certbot certbot
echo "0 0,12 * * * root /opt/certbot/bin/python -c 'import random; import time; time.sleep(random.random() * 3600)' && sudo certbot renew -q" | sudo tee -a /etc/crontab > /dev/null echo "0 0,12 * * * root /opt/certbot/bin/python -c 'import random; import time; time.sleep(random.random() * 3600)' && sudo certbot renew -q" | sudo tee -a /etc/cron.d/certbot > /dev/null
sudo ln -sf /opt/certbot/bin/certbot /usr/bin/certbot sudo ln -sf /opt/certbot/bin/certbot /usr/bin/certbot

16
templates/admin/progress.phtml
View file

@ -20,6 +20,14 @@
display: none; display: none;
} }
#no_progress pre {
margin-top:2px;
margin-bottom:2px;
}
</style> </style>
</%block> </%block>
<%block name="content"> <%block name="content">
@ -30,7 +38,7 @@ ${return_tree|n}
<hr /> <hr />
<i class="fa fa-cog fa-spin fa-5x fa-fw margin-bottom" id="gear"></i> <i class="fa fa-cog fa-spin fa-5x fa-fw margin-bottom" id="gear"></i>
<div id="progressbar"><div class="progress-label">${lang('pastafari2', 'processing_task', 'Processing task...')}</div></div> <div id="progressbar"><div class="progress-label">${lang('pastafari2', 'processing_task', 'Processing task...')}</div></div>
<div id="no_progress" style="border: solid #cbcbcb 1px;height:150px;overflow:scroll;padding:2px;"></div> <div id="no_progress" style="border: solid #cbcbcb 1px;height:550px;overflow:scroll;padding:2px;color: #fbfbfb;background:#000000 !important;font-size:0.8em;"></div>
<p id="return_block"></p> <p id="return_block"></p>
</%block> </%block>
<%block name="jscript_block"> <%block name="jscript_block">
@ -100,7 +108,7 @@ ${return_tree|n}
progressbar.progressbar( "value", progress ); progressbar.progressbar( "value", progress );
$('#no_progress').append(message+'<br />'); $('#no_progress').append(message);
objDiv.scrollTop = objDiv.scrollHeight; objDiv.scrollTop = objDiv.scrollHeight;
@ -143,7 +151,7 @@ ${return_tree|n}
{ {
//yes_progress=0; //yes_progress=0;
//$('#no_progress').append(data[k].message+'<br />'); //$('#no_progress').append(data[k].message+'<br />');
update_messages_queue(data[k].message+'<br />'); update_messages_queue('<pre>'+data[k].message.trim()+'</pre>');
//Scroll //Scroll
@ -152,7 +160,7 @@ ${return_tree|n}
if(data[k].no_progress==0) if(data[k].no_progress==0)
{ {
update_progress_messages_queue(data[k].message, data[k].progress); update_progress_messages_queue('<pre>'+data[k].message.trim()+'</pre>', data[k].progress);
} }