From 67fe61c492f5a694d7579905270e24e954751388 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 18 Jun 2008 12:29:52 +0000
Subject: [PATCH] Use ganeti.serializer module in ganeti-watcher
Reviewed-by: ultrotter
---
daemons/ganeti-watcher | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 0b4a2f43b..7e46067eb 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -33,12 +33,12 @@ import re
import time
import fcntl
import errno
-import simplejson
import logging
from optparse import OptionParser
from ganeti import utils
from ganeti import constants
+from ganeti import serializer
from ganeti import ssconf
from ganeti import errors
@@ -119,7 +119,7 @@ class WatcherState(object):
self.statefile = f
try:
- self.data = simplejson.load(self.statefile)
+ self.data = serializer.Load(self.statefile.read())
except Exception, msg:
# Ignore errors while loading the file and treat it as empty
self.data = {}
@@ -226,7 +226,7 @@ class WatcherState(object):
self.statefile.seek(0)
self.statefile.truncate()
- simplejson.dump(self.data, self.statefile)
+ self.statefile.write(serializer.Dump(self.data))
self._Close()
--
GitLab