From: Elena Mamontova <helenh463@gmail.com>
Date: Tue, 20 Dec 2016 13:31:06 +0000 (+0200)
Subject: Ticket 37. In the if() construction for the changePolicyTimeout
X-Git-Tag: 2.409~38
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/1dd842650e8b3bdf5e80dcfe98e484556386e3fa?hp=d2651fcd0809db517807aab2e259d07ad0878f4e

Ticket 37. In the if() construction for the changePolicyTimeout
ReadTime() changed to ReadString(), else construction added, error
message remowed in RestoreTariff().
---

diff --git a/projects/stargazer/plugins/store/files/file_store.cpp b/projects/stargazer/plugins/store/files/file_store.cpp
index 51c37079..d5cfefab 100644
--- a/projects/stargazer/plugins/store/files/file_store.cpp
+++ b/projects/stargazer/plugins/store/files/file_store.cpp
@@ -1471,13 +1471,10 @@ if (conf.ReadString("ChangePolicy", &str, "allow") < 0)
 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;
 }
 //-----------------------------------------------------------------------------