From 744ba6c1601353fd0157cf0fdf3bb7087c6004af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Wed, 4 May 2016 16:48:55 +0200
Subject: [PATCH] Switched to inline config, ADS specifics
---
flowmon-ads/warden3_flowmon_ads_filer.cfg | 4 ----
flowmon-ads/warden3_flowmon_ads_filer.py | 7 ++++---
2 files changed, 4 insertions(+), 7 deletions(-)
delete mode 100644 flowmon-ads/warden3_flowmon_ads_filer.cfg
diff --git a/flowmon-ads/warden3_flowmon_ads_filer.cfg b/flowmon-ads/warden3_flowmon_ads_filer.cfg
deleted file mode 100644
index b7fe0b8..0000000
--- a/flowmon-ads/warden3_flowmon_ads_filer.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "dir": "warden_sender"
- //"anonymised_target": "195.113.0.0/16"
-}
diff --git a/flowmon-ads/warden3_flowmon_ads_filer.py b/flowmon-ads/warden3_flowmon_ads_filer.py
index 801dcf6..c7d6e27 100755
--- a/flowmon-ads/warden3_flowmon_ads_filer.py
+++ b/flowmon-ads/warden3_flowmon_ads_filer.py
@@ -182,9 +182,8 @@ def gen_idea_from_ads(ads, anonymised_target):
def main():
- aconfig = read_cfg("warden3_flowmon_ads_filer.cfg")
- anonymised_target = aconfig.get('anonymised_target', None)
- sdir = SafeDir(aconfig.get("dir", "warden_sender"))
+ anonymised_target = None
+ sdir = SafeDir("/data/warden/var/feeds-out")
ads_fields = [it[0] for it in sorted(ads_fieldnames.items(), key=lambda(it): it[1]["order"])]
for row in csv.DictReader(sys.stdin, dialect="excel-tab", fieldnames=ads_fields):
@@ -199,4 +198,6 @@ def main():
if __name__ == "__main__":
+ if os.path.exists('/data/warden/var'):
+ sys.stderr = open('/data/warden/var/flowmon-ads-filer_lastrun.log', 'w')
main()
--
GitLab