Skip to content

Commit

Permalink
Tiffy 1.0.3 (#5)
Browse files Browse the repository at this point in the history
* fixed to_IDS setting not working

* fixed tiffy requiring a tags.yml file to be present to work
  • Loading branch information
robinwenzel authored Mar 11, 2020
1 parent a4804fd commit 7107884
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions tiffy.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,14 @@ def init(category, actor, family, source, first_seen, last_seen, event_tags, out
'source must be a single value or a comma delimited list of values')

#### everything is fine -> start up
# Loading config file
# Loading tags file
try:
# Load config and tags
conf = Config.parse("settings/config.yml")
attr_tags = Tags.parse("settings/tags.yml")
except FileNotFoundError:
attr_tags = Tags()
try:
# Load config
conf = Config.parse("settings/config.yml")

logging.info("Powering up flux capacitor. Starting up tiffy.")
logging.info("#### Start new TIE-Query ####")
Expand Down Expand Up @@ -250,7 +253,7 @@ def init(category, actor, family, source, first_seen, last_seen, event_tags, out
proxy_tie_addr, no_filter, disable_cert_verify)

except FileNotFoundError:
logging.error("Error: \nconfig.yml and/or tags.yml not found")
logging.error("Error: \nconfig.yml not found")

except (RuntimeError, TypeError) as ex:
click.echo(ex)
Expand Down

0 comments on commit 7107884

Please sign in to comment.