]> granicus.if.org Git - icinga2/commitdiff
Fixed log message incorrectly referring to temp file.
authorGunnar Beutner <gunnar.beutner@netways.de>
Tue, 7 Aug 2012 12:17:36 +0000 (14:17 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Tue, 7 Aug 2012 12:17:36 +0000 (14:17 +0200)
base/dynamicobject.cpp
icinga/icingaapplication.cpp

index 1995808ad2bf69dcf2c9df59a7e91cc77bed9ae5..fd7c8131609148ca68767f924c3d2a0fcae05fa0 100644 (file)
@@ -352,8 +352,10 @@ void DynamicObject::DumpObjects(const String& filename)
 {
        Logger::Write(LogInformation, "base", "Dumping program state to file '" + filename + "'");
 
+       String tempFilename = filename + ".tmp";
+
        ofstream fp;
-       fp.open(filename.CStr());
+       fp.open(tempFilename.CStr());
 
        if (!fp)
                throw_exception(runtime_error("Could not open '" + filename + "' file"));
@@ -403,6 +405,8 @@ void DynamicObject::DumpObjects(const String& filename)
                        }
                }
        }
+
+       rename(tempFilename.CStr(), filename.CStr());
 }
 
 void DynamicObject::RestoreObjects(const String& filename)
index 37336d48f27dbe4050a02af0b48557ca21579a34..937fd24737a264997b1d334f6fabae57092d11c5 100644 (file)
@@ -208,9 +208,7 @@ int IcingaApplication::Main(const vector<String>& args)
 }
 
 void IcingaApplication::DumpProgramState(void) {
-       String temp = GetStatePath() + ".tmp";
-       DynamicObject::DumpObjects(temp);
-       rename(temp.CStr(), GetStatePath().CStr());
+       DynamicObject::DumpObjects(GetStatePath());
 }
 
 IcingaApplication::Ptr IcingaApplication::GetInstance(void)