From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 19 May 2012 17:14:13 +0000 (+0300)
Subject: Merge branch 'master' into full-month-stats
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/7b03ac47dca470832f96ccdb89eb04f8597afbe1?hp=36f332ceb538480aeaed0dfa9917e983cac77389

Merge branch 'master' into full-month-stats
---

diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp
index 3a557a30..9e560a5d 100644
--- a/projects/stargazer/plugins/other/rscript/rscript.cpp
+++ b/projects/stargazer/plugins/other/rscript/rscript.cpp
@@ -36,6 +36,7 @@
 #include "stg/locker.h"
 #include "stg/user_property.h"
 #include "stg/plugin_creator.h"
+#include "stg/logger.h"
 #include "rscript.h"
 #include "ur_functor.h"
 #include "send_functor.h"
@@ -149,13 +150,14 @@ subnetFile = pvi->value[0];
 
 NRMapParser nrMapParser;
 
-if (nrMapParser.ReadFile(subnetFile))
+if (!nrMapParser.ReadFile(subnetFile))
     {
-    errorStr = nrMapParser.GetErrorStr();
-    return -1;
+    netRouters = nrMapParser.GetMap();
+    }
+else
+    {
+    GetStgLogger()("mod_rscript: error opening subnets file '%s'", subnetFile.c_str());
     }
-
-netRouters = nrMapParser.GetMap();
 
 return 0;
 }