|
From: Richard M. <dr...@us...> - 2004-07-15 01:04:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19761/system Modified Files: mysql_backup_db.py mysql_optimize_db.py Log Message: Fixes... Index: mysql_optimize_db.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/mysql_optimize_db.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mysql_optimize_db.py 16 Jun 2004 19:29:35 -0000 1.6 --- mysql_optimize_db.py 15 Jul 2004 01:04:23 -0000 1.7 *************** *** 18,24 **** import wolfpack import wolfpack.database ! from wolfpack.consts import * ! from wolfpack.time import * ! from wolfpack.database import * database = wolfpack.database --- 18,24 ---- import wolfpack import wolfpack.database ! import wolfpack.time ! from wolfpack.consts import GRAY, LOG_MESSAGE ! database = wolfpack.database *************** *** 43,47 **** def onLoad(): if accountsdriver in supporteddrivers or worlddriver in supporteddrivers: ! wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [] ) wolfpack.registercommand( "optimizedb", cmdoptimizedb ) return --- 43,47 ---- def onLoad(): if accountsdriver in supporteddrivers or worlddriver in supporteddrivers: ! wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [ wolfpack.currenttime() ] ) wolfpack.registercommand( "optimizedb", cmdoptimizedb ) return *************** *** 58,66 **** def timer( timer, args ): ! if accountsdriver in supporteddrivers or worlddriver in supporteddrivers: ! # Optimize and restart timer ! optimize_db() ! wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [] ) ! return def optimize_db(): --- 58,69 ---- def timer( timer, args ): ! if args[0] + time <= wolfpack.currenttime(): ! if accountsdriver in supporteddrivers or worlddriver in supporteddrivers: ! # Optimize and restart timer ! optimize_db() ! wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [] ) ! return True ! else: ! return False def optimize_db(): *************** *** 86,91 **** --- 89,96 ---- database.close() log( LOG_MESSAGE, "MySQL: Optimized world database!" ) + return True except: log( LOG_MESSAGE, " MySQL: Performing world/accounts optimize failed." ) + return False # SQLite if accountsdriver == sqlite or worlddriver == sqlite: *************** *** 109,113 **** database.close() log( LOG_MESSAGE, "SQLite: Optimized world database!" ) except: log( LOG_MESSAGE, "SQLite: Performing world/accounts optimize failed." ) ! return --- 114,119 ---- database.close() log( LOG_MESSAGE, "SQLite: Optimized world database!" ) + return True except: log( LOG_MESSAGE, "SQLite: Performing world/accounts optimize failed." ) ! return False Index: mysql_backup_db.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/mysql_backup_db.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mysql_backup_db.py 14 Jun 2004 18:01:15 -0000 1.4 --- mysql_backup_db.py 15 Jul 2004 01:04:23 -0000 1.5 *************** *** 19,32 **** import wolfpack import wolfpack.database ! from wolfpack.consts import * from wolfpack.time import * - from wolfpack.database import * import datetime import os # ONLY SET TO TRUE ONCE YOU ARE SETUP FOR THIS! ! enabled = FALSE # MAKE SURE YOU SET THIS! ! backup_path = '/Path/To/Wolfpack/backups' #backup_path = 'C:\Wolfpack\backups' --- 19,32 ---- import wolfpack import wolfpack.database ! from wolfpack.consts import GRAY, LOG_MESSAGE from wolfpack.time import * import datetime import os # ONLY SET TO TRUE ONCE YOU ARE SETUP FOR THIS! ! enabled = False # MAKE SURE YOU SET THIS! ! backup_path = None ! #backup_path = '/Path/To/Wolfpack/backups' #backup_path = 'C:\Wolfpack\backups' *************** *** 37,41 **** worlddriver = database.driver( database.WORLD ) ! time = 24 * 3600000 * 7 # Every Week """ --- 37,41 ---- worlddriver = database.driver( database.WORLD ) ! time = int( 24 * 3600000 * 7 ) # Every Week """ *************** *** 47,73 **** def onLoad(): ! if enabled == TRUE: if accountsdriver == 'mysql' or worlddriver == 'mysql': ! wolfpack.addtimer( time, "system.mysql_backup_db.timer", [] ) wolfpack.registercommand( "backupdb", cmdbackupdb ) def cmdbackupdb( socket, command, arguments ): ! if enabled == TRUE: if accountsdriver == 'mysql' or worlddriver == 'mysql': socket.sysmessage( "Performing a database backup.", GRAY ) backup_db() socket.sysmessage( "Done!", GRAY ) ! return def timer( timer, args ): ! if enabled == TRUE: if accountsdriver == 'mysql' or worlddriver == 'mysql': # Optimize and restart timer optimize_db() wolfpack.addtimer( time, "system.mysql_backup_db.timer", [] ) ! return def backup_db(): ! if enabled == TRUE: accountsdir = "%s/%s_accounts" % ( backup_path, datetime.date.today() ) worlddir = "%s/%s_world" % ( backup_path, datetime.date.today() ) --- 47,84 ---- def onLoad(): ! if enabled and backup_path: if accountsdriver == 'mysql' or worlddriver == 'mysql': ! wolfpack.addtimer( time, "system.mysql_backup_db.timer", [ wolfpack.currenttime() ] ) wolfpack.registercommand( "backupdb", cmdbackupdb ) + return True + else: + return False def cmdbackupdb( socket, command, arguments ): ! if enabled and backup_path: if accountsdriver == 'mysql' or worlddriver == 'mysql': socket.sysmessage( "Performing a database backup.", GRAY ) backup_db() socket.sysmessage( "Done!", GRAY ) ! return True ! else: ! return False ! else: ! return False def timer( timer, args ): ! if enabled and backup_path and ( (args[0] + time) <= wolfpack.currenttime() ): if accountsdriver == 'mysql' or worlddriver == 'mysql': # Optimize and restart timer optimize_db() wolfpack.addtimer( time, "system.mysql_backup_db.timer", [] ) ! return True ! else: ! return False ! else: ! return False def backup_db(): ! if enabled and backup_path: accountsdir = "%s/%s_accounts" % ( backup_path, datetime.date.today() ) worlddir = "%s/%s_world" % ( backup_path, datetime.date.today() ) *************** *** 109,111 **** except: log( LOG_MESSAGE, " Backup of the accounts/world database failed." ) ! return --- 120,124 ---- except: log( LOG_MESSAGE, " Backup of the accounts/world database failed." ) ! return True ! else: ! return False |
