Skip to content
Permalink
Browse files

Move log and database files to their own folders

  • Loading branch information...
jesopo committed Sep 24, 2018
1 parent ecb9d7c commit bb641b08709c3e6177729121010bc02692600360
Showing with 9 additions and 6 deletions.
  1. 0 databases/.keep
  2. 0 logs/.keep
  3. +4 −3 modules/database_backup.py
  4. +1 −1 src/Database.py
  5. +4 −2 start.py
No changes.
No changes.
@@ -15,14 +15,15 @@ def __init__(self, bot, events, exports):
next_due=time.time()+until_next_hour)

def backup(self, event):
files = glob.glob("%s.*" % self.bot.args.database)
full_location = self.bot.database.full_location
files = glob.glob("%s.*" % full_location)
files = sorted(files)

if len(files) == 5:
os.remove(files[0])

suffix = datetime.datetime.now().strftime("%y-%m-%d.%H:%M:%S")
backup_file = "%s.%s" % (self.bot.args.database, suffix)
shutil.copy2(self.bot.args.database, backup_file)
backup_file = "%s.%s" % (full_location, suffix)
shutil.copy2(fulllocation, backup_file)

event["timer"].redo()
@@ -239,7 +239,7 @@ def delete(self, user_id, channel_id, setting):
[user_id, channel_id, setting.lower()])

class Database(object):
def __init__(self, bot, directory, filename="bot.db"):
def __init__(self, bot, directory, filename):
self.bot = bot
self.filename = filename
self.full_location = os.path.join(directory, filename)
@@ -12,8 +12,10 @@ def bool_input(s):
description="Python3 event-driven asynchronous modular IRC bot")
arg_parser.add_argument("--config", "-c", default="bot.conf",
help="Location of the JSON config file")
arg_parser.add_argument("--database", "-d", default="bot.db",
arg_parser.add_argument("--database", "-d", default="databases/bot.db",
help="Location of the sqlite3 database file")
arg_parser.add_argument("--log", "-l", default="logs/bot.log",
help="Location of the main log file")
arg_parser.add_argument("--verbose", "-v", action="store_true")

args = arg_parser.parse_args()
@@ -27,7 +29,7 @@ def bool_input(s):
bot.modules = modules = ModuleManager.ModuleManager(bot, events, exports,
os.path.join(directory, "modules"))
bot.line_handler = IRCLineHandler.LineHandler(bot, bot._events)
bot.log = Logging.Log(bot, directory, "bot.log")
bot.log = Logging.Log(bot, directory, args.log)
bot.database = Database.Database(bot, directory, args.database)
bot.config = Config.Config(bot, directory, args.config).load_config()
bot.args = args

0 comments on commit bb641b0

Please sign in to comment.
You can’t perform that action at this time.