diff --git a/personal/combine/merge.py b/personal/combine/merge.py index f4a5b42..65bb810 100644 --- a/personal/combine/merge.py +++ b/personal/combine/merge.py @@ -103,7 +103,7 @@ field_actions = { "spam": FieldAction.DELETE, "stickied": FieldAction.OVERWRITE, "subreddit": FieldAction.OVERWRITE_NOT_NONE, - "subreddit_id": FieldAction.ALLOW, + "subreddit_id": FieldAction.OVERWRITE_NOT_NONE, "subreddit_name_prefixed": FieldAction.OVERWRITE_NOT_NONE, "subreddit_type": FieldAction.DONT_OVERWRITE, "top_awarded_type": FieldAction.ALLOW_EMPTY, @@ -263,7 +263,7 @@ field_actions = { "stickied": FieldAction.OVERWRITE, "subcaption": FieldAction.OVERWRITE, "subreddit": FieldAction.OVERWRITE_NOT_NONE, - "subreddit_id": FieldAction.ALLOW, + "subreddit_id": FieldAction.OVERWRITE_NOT_NONE, "subreddit_name_prefixed": FieldAction.OVERWRITE_NOT_NONE, "subreddit_subscribers": FieldAction.OVERWRITE_IF_NONE, "subreddit_type": FieldAction.DONT_OVERWRITE, diff --git a/personal/process_month.py b/personal/process_month.py index 38d0266..a07983d 100644 --- a/personal/process_month.py +++ b/personal/process_month.py @@ -212,6 +212,7 @@ def process(queue, base_folder, month, file_type, type_stages, reddit_username, # log.info(f"{file_type} {stage}: {status}") except Exception as err: queue.put((file_type, "error", str(err))) + discord_logging.flush_discord() # for stage, status in type_stages.items(): # log.info(f"{file_type} {stage}: {status}") @@ -258,4 +259,5 @@ if __name__ == "__main__": log.error(f"Error in {file_type}: {status}") stages[file_type][stage] = status save_status(status_file, stages, month) + discord_logging.flush_discord() #log.info(f"workers {workers.ready()} : queue {queue.empty()}")