diff options
| author | Andy Grover <agrover@redhat.com> | 2013-11-20 11:38:38 -0800 |
|---|---|---|
| committer | Andy Grover <agrover@redhat.com> | 2013-11-20 11:38:38 -0800 |
| commit | ce256410cbc9716fa799aaa67ca81bbbdf7b5dd9 (patch) | |
| tree | f691dd055e71445261625c2f2be79f52f2ef5ba9 | |
| parent | f343db8f9cfae0481d2968cbe612180ac3f43da7 (diff) | |
| download | targetcli-ce256410cbc9716fa799aaa67ca81bbbdf7b5dd9.tar.gz | |
Use new rtslib restore_from_file and save_to_file APIs
As a result it's now better for saveconfig to save/cull backups before
saving the current state, hopefully not a big deal.
Resolves #34
Signed-off-by: Andy Grover <agrover@redhat.com>
| -rw-r--r-- | targetcli/ui_root.py | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/targetcli/ui_root.py b/targetcli/ui_root.py index 3eb453d..e59d86d 100644 --- a/targetcli/ui_root.py +++ b/targetcli/ui_root.py @@ -65,12 +65,6 @@ class UIRoot(UINode): savefile = os.path.expanduser(savefile) - with open(savefile+".temp", "w+") as f: - os.fchmod(f.fileno(), stat.S_IRUSR | stat.S_IWUSR) - f.write(json.dumps(self.rtsroot.dump(), sort_keys=True, indent=2)) - f.write("\n") - os.fsync(f.fileno()) - # Only save backups if saving to default location if savefile == default_save_file: backup_dir = os.path.dirname(savefile) + "/backup" @@ -78,7 +72,7 @@ class UIRoot(UINode): datetime.now().strftime("%Y%m%d-%H:%M:%S") + ".json" backupfile = backup_dir + "/" + backup_name with ignored(IOError): - shutil.move(savefile, backupfile) + shutil.copy(savefile, backupfile) # Kill excess backups backups = sorted(glob(os.path.dirname(savefile) + "/backup/*.json")) @@ -89,7 +83,8 @@ class UIRoot(UINode): self.shell.log.info("Last %d configs saved in %s." % \ (kept_backups, backup_dir)) - os.rename(savefile+".temp", savefile) + self.rtsroot.save_to_file(savefile) + self.shell.log.info("Configuration saved to %s" % savefile) def ui_command_restoreconfig(self, savefile=default_save_file, clear_existing=False): @@ -104,15 +99,11 @@ class UIRoot(UINode): self.shell.log.info("Restore file %s not found" % savefile) return - with open(savefile, "r") as f: - try: - errors = self.rtsroot.restore(json.loads(f.read()), clear_existing) - except ValueError: - self.shell.log.error("Error parsing savefile: %s" % savefile) - return + errors = self.rtsroot.restore_from_file(savefile, clear_existing) if errors: - self.shell.log.error("Configuration restored, %d recoverable errors:" % len(errors)) + self.shell.log.error("Configuration restored, %d recoverable errors:" % \ + len(errors)) for error in errors: self.shell.log.error(error) else: |