From 92d1b5889afac25014883e94b51585540eeeb6be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Malo=C5=A1t=C3=ADk?= <malostik@cesnet.cz>
Date: Tue, 30 Aug 2022 14:03:26 +0200
Subject: [PATCH] Renamed {cat,tag}map_mysql.json to {cat,tag}map_db.json
as the json structure stored is not specific to any database management
system.
---
warden_server/README | 12 ++++++------
warden_server/{catmap_mysql.json => catmap_db.json} | 0
warden_server/{tagmap_mysql.json => tagmap_db.json} | 0
warden_server/warden_server.py | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
rename warden_server/{catmap_mysql.json => catmap_db.json} (100%)
rename warden_server/{tagmap_mysql.json => tagmap_db.json} (100%)
diff --git a/warden_server/README b/warden_server/README
index 635fd19..6f871be 100644
--- a/warden_server/README
+++ b/warden_server/README
@@ -186,22 +186,22 @@ object from particular section list is used ("FileLogger" for example).
retry_count: number of retries, defaults to 3
event_size_limit: max size of serialized event, defaults to 5 MB
catmap_filename: IDEA category mapping to database ids, defaults to
- "catmap_mysql.json" at installation directory
+ "catmap_db.json" at installation directory
tagmap_filename": IDEA node type mapping to database ids, defaults to
- "tagmap_mysql.json" at installation directory
+ "tagmap_db.json" at installation directory
WardenHandler: Main Warden RPC worker
send_events_limit: max events sent in one bunch, defaults to 10000
get_events_limit: max events received in one bunch, defaults to 10000
description: human readable description, sent in server info
-
+
------------------------------------------------------------------------------
E. Command line
When run from command line, server offers set of commands and options for
runtime and database management. You can also use --help option for each
command and for server itself.
-
+
warden_server.py [--help] [-c CONFIG] <command>
optional arguments:
@@ -285,8 +285,8 @@ warden_server.py purge [--help] [-l] [-e] [-d DAYS]
warden_server.py loadmaps [--help]
- Load 'categories' and 'tags' table from 'catmap_mysql.json' and
- 'tagmap_mysql.json'. Note that this is NOT needed for server at all, load
+ Load 'categories' and 'tags' table from 'catmap_db.json' and
+ 'tagmap_db.json'. Note that this is NOT needed for server at all, load
them into db at will, should you need to run your own specific SQL queries
on data directly. Note also that previous content of both tables will be
lost.
diff --git a/warden_server/catmap_mysql.json b/warden_server/catmap_db.json
similarity index 100%
rename from warden_server/catmap_mysql.json
rename to warden_server/catmap_db.json
diff --git a/warden_server/tagmap_mysql.json b/warden_server/tagmap_db.json
similarity index 100%
rename from warden_server/tagmap_mysql.json
rename to warden_server/tagmap_db.json
diff --git a/warden_server/warden_server.py b/warden_server/warden_server.py
index 0dc445a..8c881e8 100755
--- a/warden_server/warden_server.py
+++ b/warden_server/warden_server.py
@@ -1305,8 +1305,8 @@ param_def = {
"retry_pause": {"type": "natural", "default": 3},
"retry_count": {"type": "natural", "default": 3},
"event_size_limit": {"type": "natural", "default": 5*1024*1024},
- "catmap_filename": {"type": "filepath", "default": path.join(path.dirname(__file__), "catmap_mysql.json")},
- "tagmap_filename": {"type": "filepath", "default": path.join(path.dirname(__file__), "tagmap_mysql.json")}
+ "catmap_filename": {"type": "filepath", "default": path.join(path.dirname(__file__), "catmap_db.json")},
+ "tagmap_filename": {"type": "filepath", "default": path.join(path.dirname(__file__), "tagmap_db.json")}
},
WardenHandler: {
"req": {"type": "obj", "default": "req"},
@@ -1663,7 +1663,7 @@ def get_args():
subargp_loadmaps = subargp.add_parser(
"loadmaps", add_help=False,
description=(
- "Load 'categories' and 'tags' table from 'catmap_mysql.json' and 'tagmap_mysql.json'."
+ "Load 'categories' and 'tags' table from 'catmap_db.json' and 'tagmap_db.json'."
" Note that this is NOT needed for server at all, load them into db at will,"
" should you need to run your own specific SQL queries on data directly."
" Note also that previous content of both tables will be lost."),
--
GitLab