X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=database.py;h=a7099bc7cd0cb1717837a63cb5efdd1830229008;hp=ff92bb307bfbbf5eb5472d9dd64662d4a2263d37;hb=HEAD;hpb=2142f4dd5292b8f6fec582d4b22d4961e49a3158 diff --git a/database.py b/database.py index ff92bb3..a7099bc 100644 --- a/database.py +++ b/database.py @@ -98,10 +98,12 @@ keys.""" if rec['timestamp'] < self._min_timestamp: return name = rec['name'] old_rec = self.get(name) - if old_rec == None: self[name] = rec + if old_rec == None: + self[name] = rec elif rec['timestamp'] > old_rec['timestamp']: for key in list(old_rec.keys()): - if not key.startswith('_'): del old_rec[key] + if not key.startswith('_'): + del old_rec[key] old_rec.update(rec) def set_min_timestamp(self, ts): @@ -184,7 +186,7 @@ It proceeds to handle dump requests forever.""" db_lock.release() try: tools.write_file( - DB_FILE, lambda f: f.write(db_pickle.decode())) + DB_FILE, lambda f: f.write(db_pickle), binary=True) logger.log_database(db) except: logger.log_exc("database.start: failed to pickle/dump")