MatthiasQuintern/regina
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nicer print messages

Browse Source
This commit is contained in:
matthias@arch 2023-05-18 03:19:33 +02:00
parent 89ece30dc4
commit 541a18faec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
regina/main.py
View File

@ -94,6 +94,7 @@ def main():
# if not isfile(settings["db"]): # if not isfile(settings["db"]):
# create_db(settings["db"], settings["filegroups"], settings["locs_and_dirs"], settings["auto_group_filetypes"]) # create_db(settings["db"], settings["filegroups"], settings["locs_and_dirs"], settings["auto_group_filetypes"])
pmessage(f"regina version='{version}': server-name='{settings['regina']['server_name']}', database='{db_path}'")
if args.update_geoip: if args.update_geoip:
if not path.isfile(args.update_geoip): if not path.isfile(args.update_geoip):
parser.error(f"invalid path to GeoIP database: '{args.update_geoip}'") parser.error(f"invalid path to GeoIP database: '{args.update_geoip}'")
@ -103,15 +104,14 @@ def main():
db.update_ip_range_id(visitor_id) db.update_ip_range_id(visitor_id)
if args.collect: if args.collect:
pmessage(f"regina version {version} with server-name '{settings['regina']['server_name']}', database '{db_path}' and logfile '{settings['regina']['access_log']}'")
requests = parse_log(settings['regina']["access_log"]) requests = parse_log(settings['regina']["access_log"])
request_count, visitors_count, new_visitors_count = db.add_requests(requests) request_count, visitors_count, new_visitors_count = db.add_requests(requests)
if visitors_count > 0: percentage = 100.0*new_visitors_count/visitors_count if visitors_count > 0: percentage = 100.0*new_visitors_count/visitors_count
else: percentage = '--' else: percentage = 0.0
pmessage(f"Added {request_count} new requests from {visitors_count} different visitors, from which {new_visitors_count} are new ({percentage:2}%)") pmessage(f"-> from logfile '{settings['regina']['access_log']}':\n\t+ {request_count} new requests\n\t+ {visitors_count} total visitors\n\t+ {new_visitors_count} new visitors ({percentage:.2f}%)")
if args.visualize: if args.visualize:
pmessage(f"regina version {version} with server-name '{settings['regina']['server_name']}', database '{db_path}'") # pmessage(f"regina version {version} with server-name '{settings['regina']['server_name']}', database '{db_path}'")
visualize(db) visualize(db)
if __name__ == '__main__': if __name__ == '__main__':