Skip to content

Commit

Permalink
[scripts]: add support to db_migrator for non-default unix socket (so…
Browse files Browse the repository at this point in the history
…nic-net#551)

* [scripts]: add support to db_migrator for non-default unix socket

* add '-s' option to db_migrator

Signed-off-by: Lawrence Lee <t-lale@microsoft.com>

* [scripts]: make db_migrator follow python convention

* change variable names

Signed-off-by: Lawrence Lee <t-lale@microsoft.com>
  • Loading branch information
theasianpianist authored and yxieca committed Jun 18, 2019
1 parent 98e087f commit c6a08f7
Showing 1 changed file with 24 additions and 4 deletions.
28 changes: 24 additions & 4 deletions scripts/db_migrator.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python

import traceback
import sys
import argparse
import syslog
Expand All @@ -22,7 +23,7 @@ def log_error(msg):


class DBMigrator():
def __init__(self):
def __init__(self, socket=None):
"""
Version string format:
version_<major>_<minor>_<build>
Expand All @@ -39,7 +40,12 @@ def __init__(self):
self.TABLE_NAME = 'VERSIONS'
self.TABLE_KEY = 'DATABASE'
self.TABLE_FIELD = 'VERSION'
self.configDB = ConfigDBConnector()

db_kwargs = {}
if socket:
db_kwargs['unix_socket_path'] = socket

self.configDB = ConfigDBConnector(**db_kwargs)
self.configDB.db_connect('CONFIG_DB')


Expand Down Expand Up @@ -120,16 +126,30 @@ def main():
choices=['migrate', 'set_version', 'get_version'],
help = 'operation to perform [default: get_version]',
default='get_version')
parser.add_argument('-s',
dest='socket',
metavar='unix socket',
type = str,
required = False,
help = 'the unix socket that the desired database listens on',
default = None )
args = parser.parse_args()
operation = args.operation
socket_path = args.socket

if socket_path:
dbmgtr = DBMigrator(socket=socket_path)
else:
dbmgtr = DBMigrator()

dbmgtr = DBMigrator()
result = getattr(dbmgtr, operation)()
if result:
print(str(result))

except Exception as e:
log_error('Caught excetion: ' + str(e))
log_error('Caught exception: ' + str(e))
traceback.print_exc()
print(str(e))
parser.print_help()
sys.exit(1)

Expand Down

0 comments on commit c6a08f7

Please sign in to comment.