Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16134/system
Modified Files:
mysql_backup_db.py mysql_optimize_db.py
Log Message:
More import cleanups...
Removed wolfpack.currentime() and moved it to wolfpack.time.currenttime() / wolfpack.time.servertime()
It seems to belong here more than it would in wolfpack.currenttime()
Scripts updated to support this.
Index: mysql_optimize_db.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/mysql_optimize_db.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mysql_optimize_db.py 15 Jul 2004 01:04:23 -0000 1.7
--- mysql_optimize_db.py 16 Jul 2004 07:09:28 -0000 1.8
***************
*** 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
--- 43,47 ----
def onLoad():
if accountsdriver in supporteddrivers or worlddriver in supporteddrivers:
! wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [ wolfpack.time.currenttime() ] )
wolfpack.registercommand( "optimizedb", cmdoptimizedb )
return
***************
*** 58,62 ****
def timer( timer, args ):
! if args[0] + time <= wolfpack.currenttime():
if accountsdriver in supporteddrivers or worlddriver in supporteddrivers:
# Optimize and restart timer
--- 58,62 ----
def timer( timer, args ):
! if int( args[0] + time ) <= wolfpack.time.currenttime():
if accountsdriver in supporteddrivers or worlddriver in supporteddrivers:
# Optimize and restart timer
Index: mysql_backup_db.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/mysql_backup_db.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mysql_backup_db.py 15 Jul 2004 01:04:23 -0000 1.5
--- mysql_backup_db.py 16 Jul 2004 07:09:28 -0000 1.6
***************
*** 49,53 ****
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
--- 49,53 ----
if enabled and backup_path:
if accountsdriver == 'mysql' or worlddriver == 'mysql':
! wolfpack.addtimer( time, "system.mysql_backup_db.timer", [ wolfpack.time.currenttime() ] )
wolfpack.registercommand( "backupdb", cmdbackupdb )
return True
***************
*** 68,72 ****
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
--- 68,72 ----
def timer( timer, args ):
! if enabled and backup_path and ( int( args[0] + time ) <= wolfpack.time.currenttime() ):
if accountsdriver == 'mysql' or worlddriver == 'mysql':
# Optimize and restart timer
|
