Skip to content

Commit

Permalink
Merge pull request #314 from guardicore/improvment/fix-gitignore
Browse files Browse the repository at this point in the history
minor fixes, added vim swp files to gitignore
  • Loading branch information
danielguardicore authored May 7, 2019
2 parents 52a1149 + 467e43a commit 75f26f9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,5 @@ MonkeyZoo/*
!MonkeyZoo/config.tf
!MonkeyZoo/MonkeyZooDocs.pdf


# vim swap files
*.swp
8 changes: 5 additions & 3 deletions monkey/infection_monkey/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
from infection_monkey.dropper import MonkeyDrops
from infection_monkey.model import MONKEY_ARG, DROPPER_ARG
from infection_monkey.monkey import InfectionMonkey
import infection_monkey.post_breach # dummy import for pyinstaller
# noinspection PyUnresolvedReferences
import infection_monkey.post_breach # dummy import for pyinstaller

__author__ = 'itamar'

Expand All @@ -23,7 +24,7 @@
'disable_existing_loggers': False,
'formatters': {'standard': {
'format': '%(asctime)s [%(process)d:%(thread)d:%(levelname)s] %(module)s.%(funcName)s.%(lineno)d: %(message)s'},
},
},
'handlers': {'console': {'class': 'logging.StreamHandler',
'level': 'DEBUG',
'formatter': 'standard'},
Expand Down Expand Up @@ -70,7 +71,8 @@ def main():
print("Loaded Configuration: %r" % WormConfiguration.as_dict())

# Make sure we're not in a machine that has the kill file
kill_path = os.path.expandvars(WormConfiguration.kill_file_path_windows) if sys.platform == "win32" else WormConfiguration.kill_file_path_linux
kill_path = os.path.expandvars(
WormConfiguration.kill_file_path_windows) if sys.platform == "win32" else WormConfiguration.kill_file_path_linux
if os.path.exists(kill_path):
print("Kill path found, finished run")
return True
Expand Down
Empty file modified monkey/monkey_island/linux/install_mongo.sh
100644 → 100755
Empty file.

0 comments on commit 75f26f9

Please sign in to comment.