diff --git a/src/bindings/python/fluxacct/accounting/__init__.py.in b/src/bindings/python/fluxacct/accounting/__init__.py.in index 51dfab19..479ca042 100644 --- a/src/bindings/python/fluxacct/accounting/__init__.py.in +++ b/src/bindings/python/fluxacct/accounting/__init__.py.in @@ -1,5 +1,5 @@ -db_dir = "@X_LOCALSTATEDIR@/lib/flux/" -db_path = "@X_LOCALSTATEDIR@/lib/flux/FluxAccounting.db" -db_schema_version = 23 +DB_DIR = "@X_LOCALSTATEDIR@/lib/flux/" +DB_PATH = "@X_LOCALSTATEDIR@/lib/flux/FluxAccounting.db" +DB_SCHEMA_VERSION = 23 -__all__ = ["db_dir", "db_path", "db_schema_version"] +__all__ = ["DB_DIR", "DB_PATH", "DB_SCHEMA_VERSION"] diff --git a/src/bindings/python/fluxacct/accounting/create_db.py b/src/bindings/python/fluxacct/accounting/create_db.py index 15c28b53..94fa9c0c 100755 --- a/src/bindings/python/fluxacct/accounting/create_db.py +++ b/src/bindings/python/fluxacct/accounting/create_db.py @@ -85,7 +85,7 @@ def create_db( sys.exit(1) # set version number of database - conn.execute("PRAGMA user_version = %d" % (fluxacct.accounting.db_schema_version)) + conn.execute("PRAGMA user_version = %d" % (fluxacct.accounting.DB_SCHEMA_VERSION)) # Association Table logging.info("Creating association_table in DB...") diff --git a/src/cmd/flux-account-fetch-job-records.py b/src/cmd/flux-account-fetch-job-records.py index 87fed4bf..344b8ee8 100755 --- a/src/cmd/flux-account-fetch-job-records.py +++ b/src/cmd/flux-account-fetch-job-records.py @@ -22,7 +22,7 @@ def set_db_loc(args): - path = args.path if args.path else fluxacct.accounting.db_path + path = args.path if args.path else fluxacct.accounting.DB_PATH return path diff --git a/src/cmd/flux-account-priority-update.py b/src/cmd/flux-account-priority-update.py index e023d382..5f605104 100755 --- a/src/cmd/flux-account-priority-update.py +++ b/src/cmd/flux-account-priority-update.py @@ -23,7 +23,7 @@ def set_db_loc(args): - path = args.path if args.path else fluxacct.accounting.db_path + path = args.path if args.path else fluxacct.accounting.DB_PATH return path @@ -49,7 +49,7 @@ def est_sqlite_conn(path): cur = conn.cursor() cur.execute("PRAGMA user_version") db_version = cur.fetchone()[0] - if db_version < fluxacct.accounting.db_schema_version: + if db_version < fluxacct.accounting.DB_SCHEMA_VERSION: print( """flux-accounting database out of date; updating DB with """ """'flux account-update-db' before sending information to plugin""" diff --git a/src/cmd/flux-account-service.py b/src/cmd/flux-account-service.py index 9a7a6d67..01eff28e 100755 --- a/src/cmd/flux-account-service.py +++ b/src/cmd/flux-account-service.py @@ -599,7 +599,7 @@ def main(): # try to connect to flux-accounting database; if connection fails, exit # flux-accounting service - db_path = args.path if args.path else fluxacct.accounting.db_path + db_path = args.path if args.path else fluxacct.accounting.DB_PATH conn = establish_sqlite_connection(db_path) # check version of database; if not up to date, output message diff --git a/src/cmd/flux-account-update-db.py b/src/cmd/flux-account-update-db.py index 912ad3f1..a4c57449 100755 --- a/src/cmd/flux-account-update-db.py +++ b/src/cmd/flux-account-update-db.py @@ -23,7 +23,7 @@ def set_db_loc(args): - path = args.old_db if args.old_db else fluxacct.accounting.db_path + path = args.old_db if args.old_db else fluxacct.accounting.DB_PATH return path @@ -238,7 +238,7 @@ def update_db(path, new_db): # update user_version for DB old_cur.execute( - "PRAGMA user_version = %d" % (fluxacct.accounting.db_schema_version) + "PRAGMA user_version = %d" % (fluxacct.accounting.DB_SCHEMA_VERSION) ) # commit changes diff --git a/src/cmd/flux-account.py b/src/cmd/flux-account.py index dac4a5e8..24c2b0e9 100755 --- a/src/cmd/flux-account.py +++ b/src/cmd/flux-account.py @@ -645,7 +645,7 @@ def add_arguments_to_parser(parser, subparsers): def set_db_location(args): - path = args.path if args.path else fluxacct.accounting.db_path + path = args.path if args.path else fluxacct.accounting.DB_PATH return path