Merge branch 'release/1.4.4'

README.md

@@ -100,18 +100,18 @@ SpamScope will check on it to decide if mail/attachment is already analyzed or n
 
 ## Usage
 SpamScope comes with four topologies:
-   - debug
-   - elasticsearch
-   - redis
-   - testing
+   - spamscope_debug
+   - spamscope_elasticsearch
+   - spamscope_redis
+   - spamscope_testing
 
 and a general configuration file `spamscope.example.yml` in `conf/` folder.
 
 
 If you want submit SpamScope topology use `spamscope-topology submit` tool. For more details `spamscope-topology submit -h`:
 
 ```
-$ spamscope-topology submit --topology {debug,elasticsearch,redis,testing}
+$ spamscope-topology submit --topology {spamscope_debug,spamscope_elasticsearch,spamscope_redis,spamscope_testing}
 ```
 
 There are some options that you can use.

conf/templates/commons.json

@@ -0,0 +1,9 @@
+{
+  "order": 10,
+  "template": "*",
+  "settings": {
+    "index.codec": "best_compression",
+    "index.number_of_replicas": 0,
+    "index.refresh_interval": "5s"
+  }
+}

conf/templates/spamscope.json

@@ -1,5 +1,5 @@
 {
-  "order": 10,
+  "order": 0,
   "template": "spamscope_*-*",
   "settings": {
     "analysis": {

project.clj

@@ -1,10 +1,10 @@
-(defproject spamscope "1.4.0-SNAPSHOT"
+(defproject spamscope "1.4.4-SNAPSHOT"
   :resource-paths ["_resources"]
   :target-path "_build"
   :min-lein-version "2.0.0"
   :jvm-opts ["-client"]
-  :dependencies  [[org.apache.storm/storm-core "1.0.2"]
-                  [org.apache.storm/flux-core "1.0.2"]]
+  :dependencies  [[org.apache.storm/storm-core "1.0.3"]
+                  [org.apache.storm/flux-core "1.0.3"]]
   :jar-exclusions     [#"log4j\.properties" #"org\.apache\.storm\.(?!flux)" #"trident" #"META-INF" #"meta-inf" #"\.yaml"]
   :uberjar-exclusions [#"log4j\.properties" #"org\.apache\.storm\.(?!flux)" #"trident" #"META-INF" #"meta-inf" #"\.yaml"]
   )

src/cli/README.md

@@ -35,7 +35,7 @@ usage: spamscope-topology submit [-h] [-g {debug,elasticsearch,redis,testing}]
 
 optional arguments:
   -h, --help            show this help message and exit
-  -g {debug,elasticsearch,redis,testing}, --topology {debug,elasticsearch,redis,testing}
+  -g {spamscope_debug,spamscope_elasticsearch,spamscope_redis,spamscope_testing}, --topology {spamscope_debug,spamscope_elasticsearch,spamscope_redis,spamscope_testing}
                         SpamScope topology.
   -w WORKERS, --workers WORKERS
                         Apache Storm workers for your topology.

src/cli/spamscope_elasticsearch.py

@@ -38,7 +38,7 @@
 ch = logging.StreamHandler(sys.stdout)
 ch.setLevel(logging.DEBUG)
 formatter = logging.Formatter(
-    "%(asctime)s - %(funcName)s - %(levelname)s - %(message)s")
+    "[%(asctime)s] [%(levelname)s] [%(funcName)s] %(message)s")
 ch.setFormatter(formatter)
 log.addHandler(ch)
 
@@ -142,15 +142,16 @@ def update_template(client_host, max_retry, template_path, template_name):
     for i in range(1, max_retry):
         try:
             es.indices.put_template(name=template_name, body=body)
-            log.info("Updating template done")
+            log.info("Updating template {!r} done".format(template_name))
             return
 
         except (ConnectionError, NotFoundError):
             log.warning(
-                "Updating template failed. Waiting for {} sec".format(i))
+                "Updating template {!r} failed. Waiting for {} sec".format(
+                    template_name, i))
             time.sleep(i)
 
-    log.error("Updating template definitely failed")
+    log.error("Updating template {!r} definitely failed".format(template_name))
 
 
 def main():

src/cli/spamscope_topology.py

@@ -57,7 +57,8 @@ def get_args():
     submit.add_argument(
         "-g",
         "--topology",
-        choices=["debug", "elasticsearch", "redis", "testing"],
+        choices=["spamscope_debug", "spamscope_elasticsearch",
+                 "spamscope_redis", "spamscope_testing"],
         default="debug",
         help="SpamScope topology.",
         dest="topology")
@@ -124,9 +125,7 @@ def submit_topology(topology, nr_worker, tick, max_pending,
 
     args = shlex.split(command_line)
     proc = Popen(args, stderr=STDOUT)
-    outs, errs = proc.communicate()
-    print(outs)
-    print(errs)
+    _, _ = proc.communicate()
 
 
 def main():

src/options.py

@@ -19,7 +19,7 @@
 
 from os.path import join
 
-__version__ = "v1.4.2"
+__version__ = "v1.4.4"
 __configuration_path__ = "/etc/spamscope"
 
 __defaults__ = {