diff --git a/scscanner.py b/scscanner.py index 092741f..7cb5323 100644 --- a/scscanner.py +++ b/scscanner.py @@ -16,7 +16,7 @@ rootparser.add_argument('--file', help='Please provide file path to Scan file') parser.add_argument('--verbose', help='For verbose running') parser.add_argument('--maxlines', help='Please provide maxium line numbers', default=3) -parser.add_argument('--outputfile', help='Provide the filename', required=True) +parser.add_argument('-o', '--outfile', help='Provide the filename', required=True) parser.add_argument('--json', help='For Json OutPut') parser.add_argument('--jira', help='Send OutPut to your Jira instance', action='store_true') parser.add_argument('--slack', help='Send OutPut to your Slack WorkSpace Channel', action='store_true') @@ -29,7 +29,7 @@ file = argss.file lines = argss.maxlines verbose = argss.verbose -outputfile = argss.outputfile +outputfile = argss.outfile jsonfile = argss.json check = argss.check jira = argss.jira diff --git a/src/file_sender.py b/src/file_sender.py index fbeb20f..6681428 100644 --- a/src/file_sender.py +++ b/src/file_sender.py @@ -41,6 +41,7 @@ def slack_token_retriever(send_to_app): for lists in configdata['slack']: if lists['bot_token'] == "" and lists['channel_name'] == "": logger.error("Please provide the valid Bot_Token and Channel Name") + sys.exit() else: return (lists['bot_token'], lists['channel_name']) @@ -61,6 +62,6 @@ def slack_issue_creator(filename): } response = requests.post( url=url, data=data, headers={"Content-Type": "application/x-www-form-urlencoded"}) if response.status_code == 200: - print('\n\n', logger.info("File Successfully Sent to Slack")) + logger.info("File Successfully Sent to Slack") diff --git a/utils/logs_handler.py b/utils/logs_handler.py index a9afa09..e4ed960 100644 --- a/utils/logs_handler.py +++ b/utils/logs_handler.py @@ -30,7 +30,7 @@ def create_logger(logger_name, remote_logging=False): logger = logging.getLogger(logger_name) if not logger.handlers: logger.setLevel(logging.DEBUG) - log_template = "%(asctime)s %(module)s %(levelname)s: %(message)s" + log_template = "%(module)s %(levelname)s: %(message)s" formatter = logging.Formatter(log_template) log_file_size_in_mb = 10 count_of_backups = 10 # example.log example.log.1 example.log.2 @@ -47,7 +47,7 @@ def create_logger(logger_name, remote_logging=False): logger.addHandler(file_handler) # Stdout handler - log_template = "%(asctime)s %(module)s %(levelname)s: %(message)s" + log_template = "%(module)s %(levelname)s: %(message)s" formatter = logging.Formatter(log_template) stdout_handler = logging.StreamHandler(sys.stdout) stdout_handler.setFormatter(formatter) @@ -55,7 +55,7 @@ def create_logger(logger_name, remote_logging=False): if remote_logging: # HTTP handler - log_template = "%(asctime)s %(module)s %(levelname)s: %(message)s" + log_template = "%(module)s %(levelname)s: %(message)s" formatter = logging.Formatter(log_template) http_handler = logging.handlers.HTTPHandler(host=cfg.remote_logging_host, url=cfg.remote_logging_endpoint,