git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag nodemanager-2.1-8
[nodemanager.git]
/
bwmon.py
diff --git
a/bwmon.py
b/bwmon.py
index
ba59fe8
..
246fd6f
100644
(file)
--- a/
bwmon.py
+++ b/
bwmon.py
@@
-23,7
+23,8
@@
import socket
import copy
import threading
import copy
import threading
-import bwlimitlxc as bwlimit
+import plnode.bwlimit as bwlimit
+
import logger
import tools
import database
import logger
import tools
import database
@@
-496,6
+497,9
@@
def sync(nmdbcopy):
if default_MaxRate == -1:
default_MaxRate = 1000000
if default_MaxRate == -1:
default_MaxRate = 1000000
+ # xxx $Id$
+ # with svn we used to have a trick to detect upgrades of this file
+ # this has gone with the move to git, without any noticeable effect on operations though
try:
f = open(DB_FILE, "r+")
logger.verbose("bwmon: Loading %s" % DB_FILE)
try:
f = open(DB_FILE, "r+")
logger.verbose("bwmon: Loading %s" % DB_FILE)