Updated to reset report type on reload #2361

Author: elsif2

intelmq/bots/parsers/shadowserver/README.md

@@ -11,6 +11,6 @@ The report configuration is now stored in a _schema.json_ file downloaded from h
 
 For environments that have internet connectivity the `update_schema.py` script should be setup as a cron job to obtain the latest revision.
 
-For air-gapped systems automation will be required to download and copy the  _schema.json_ file into this directory
+For air-gapped systems automation will be required to download and copy the  _schema.json_ file into this directory.
 
 The parser will automatically reload the configuration when the file changes.

intelmq/bots/parsers/shadowserver/_config.py

@@ -272,15 +272,14 @@ def scan_exchange_identifier(field):
 def reload ():
     """ reload the configuration if it has changed """
     mtime = 0.0
+    schema_file = __config.schema_file
 
-    if (os.path.isfile(__config.schema_file)):
+    if os.path.isfile(__config.schema_file):
         mtime = os.path.getmtime(__config.schema_file)
         if __config.schema_mtime == mtime:
             return
-        schema_file = __config.schema_file
     else:
         # load a test schema if one has not been downloaded yet
-        schema_file = __config.schema_file
         schema_file += '.test'
 
     __config.feedname_mapping.clear()

intelmq/bots/parsers/shadowserver/parser.py

@@ -220,5 +220,8 @@ def parse_line(self, row, report):
 
         yield event
 
+    def shutdown(self):
+        self.feedname = None
+
 
 BOT = ShadowserverParserBot