Skip to content

Commit 9160246

Browse files
committed
bug fix: database delete
1 parent a4bb0bd commit 9160246

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

cyberpanel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ redis_installation() {
585585
if [[ CENTOS_8 == "True" ]]; then
586586
yum install -y lsphp74-redis lsphp73-redis lsphp72-redis lsphp71-redis lsphp70-redis lsphp56-redis lsphp55-redis lsphp54-redis redis
587587
else
588-
yum -y install http://rpms.remirepo.net/enterprise/remi-release-7.rpm
588+
yum -y install http://rpms.remirepo.net/enterprise/remi-release-7.rpm
589589
yum-config-manager --disable remi
590590
yum-config-manager --disable remi-safe
591591
yum -y --enablerepo=remi install redis

plogical/mysqlUtilities.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,9 @@ def submitDBDeletion(dbName):
381381
databaseToBeDeleted.delete()
382382
return 1,'None'
383383
else:
384-
return 0,result
384+
databaseToBeDeleted.delete()
385+
logging.CyberCPLogFileWriter.writeToFile('Deleted database with some errors. Error: %s' % (result))
386+
return 1,'None'
385387

386388
except BaseException as msg:
387389
logging.CyberCPLogFileWriter.writeToFile(str(msg))

0 commit comments

Comments
 (0)