]> git.stg.codes - stg.git/commitdiff
Merge branch 'master' into full-month-stats
authorMaxim Mamontov <faust.madf@gmail.com>
Sat, 19 May 2012 17:14:13 +0000 (20:14 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Sat, 19 May 2012 17:14:13 +0000 (20:14 +0300)
projects/stargazer/plugins/other/rscript/rscript.cpp

index 3a557a3088a1ec7c32b48260a5dfa1db1564b5bb..9e560a5d6062394baa90c3ef19b7dd24a5e8e64c 100644 (file)
@@ -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;
 }