diff --git a/libraries/task.py b/libraries/task.py index 5517e30..56c0192 100644 --- a/libraries/task.py +++ b/libraries/task.py @@ -480,7 +480,7 @@ class Task: #self.task.conditions=['WHERE id=%s', [self.id]] #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() return False @@ -511,7 +511,7 @@ class Task: #self.task.conditions=['WHERE id=%s', [self.id]] #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 diff --git a/scripts/system/install_python.sh b/scripts/system/install_python.sh index 50ab943..142301d 100644 --- a/scripts/system/install_python.sh +++ b/scripts/system/install_python.sh @@ -107,7 +107,7 @@ sudo /opt/certbot/bin/pip install --upgrade pip 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 diff --git a/templates/admin/progress.phtml b/templates/admin/progress.phtml index dab8316..19a3900 100644 --- a/templates/admin/progress.phtml +++ b/templates/admin/progress.phtml @@ -20,6 +20,14 @@ display: none; } + + #no_progress pre { + + margin-top:2px; + margin-bottom:2px; + + } + %block> <%block name="content"> @@ -30,7 +38,7 @@ ${return_tree|n}
'+data[k].message.trim()+''); //Scroll @@ -152,7 +160,7 @@ ${return_tree|n} if(data[k].no_progress==0) { - update_progress_messages_queue(data[k].message, data[k].progress); + update_progress_messages_queue('
'+data[k].message.trim()+'', data[k].progress); }