]> git.stg.codes - stg.git/commitdiff
Ticket 37. In the if() construction for the changePolicyTimeout
authorElena Mamontova <helenh463@gmail.com>
Tue, 20 Dec 2016 13:31:06 +0000 (15:31 +0200)
committerMaxim Mamontov <faust.madf@gmail.com>
Thu, 22 Dec 2016 19:33:19 +0000 (21:33 +0200)
ReadTime() changed to ReadString(), else construction added, error
message remowed in RestoreTariff().

projects/stargazer/plugins/store/files/file_store.cpp

index 51c3707910c34bbd3bf087c638c341f5060fd5f0..d5cfefaba6fb799bfa5e5f7070871660e63acd54 100644 (file)
@@ -1471,13 +1471,10 @@ if (conf.ReadString("ChangePolicy", &str, "allow") < 0)
 else
     td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(str);
 
 else
     td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(str);
 
-if (conf.ReadTime("ChangePolicyTimeout", &td->tariffConf.changePolicyTimeout, 0) < 0)
-    {
-    STG_LOCKER lock(&mutex);
-    errorStr = "Cannot read tariff " + tariffName + ". Parameter ChangePolicyTimeout";
-    printfd(__FILE__, "FILES_STORE::RestoreTariff - changepolicytimeout read failed for tariff '%s'\n", tariffName.c_str());
-    return -1;
-    }
+if (conf.ReadString("ChangePolicyTimeout", &str, "1970-01-01 00:00:00") < 0)
+    td->tariffConf.changePolicyTimeout = 0;
+else
+    td->tariffConf.changePolicyTimeout = readTime(str);
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------