Mercurial > hg > release > thermostat-0.4
view tools/src/main/resources/com/redhat/thermostat/tools/strings.properties @ 636:9e4437930235
Add DB connection service
This should improve usability of the Thermostat shell. In particular in a
remote setup. The current situation is that if a shell is fired up it does not
make a connection to storage. So if a user has storage set up to bind to a
"public" IP, 192.1.1.129 say, then mongo requires username/password for
connections. This results in bad usability of the shell:
./bin/thermostat shell
Thermostat > ping
Could not connect to db mongodb://192.168.1.14:27518
(creds are missing or incorrect host IP in user prefs)
Thermostat > ping --username blah --password blah -d
mongodb://example.org
(works)
Thermostat > list-vms --username blah --password blah -d ...
(i.e. a user needs to pass credential info for every command on the
shell).
This patch introduces a "connect" and "disconnect" command which
establishes a DB connection on demand and registers a DbService. The
above shell session becomes:
./bin/thermostat shell
Thermostat > ping
Could not connect to db mongodb://192.168.1.14:27518
Thermostat > connect -d mongodb://192.168.1.14:27518 -u blah -p blah
Thermostat > ping agent-id
(works)
Thermostat > list-vms
(works)
Thermostat > disconnect
(disconnects from mongo storage at 192.168.1.14:27518)
Thermostat > ping
Could not connect to db mongodb://192.168.1.14:27518
Details of the patch:
-----------------------------------------------------------------
1. It removes AppContextSetup/AppContextSetupImpl
2. Modifies LauncherImpl in order to use the new DbService (i.e.
other use cases remain the same)
3. OSGIUtils now returns the ServiceRegistration for registered
services.
4. Added a method which allows services to be null to OSGIUtils.
Existing getService() throws a NPE if the service reference is
null (bundleContext.getServiceReference(clazz)).
5. Adds ConnectCommand ("connect" on shell)
6. Adds DisconnectCommand ("disconnect" on shell)
7. Tests
Reviewed-by: omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-September/003341.html
PR1164
author | Severin Gehwolf <sgehwolf@redhat.com> |
---|---|
date | Fri, 21 Sep 2012 18:17:41 +0200 |
parents | ac3d23577264 |
children | 486a299ab905 |
line wrap: on
line source
MISSING_INFO = Missing Information VALUE_AND_UNIT = {0} {1} COMMAND_LIST_VMS_DESCRIPTION = lists all currently monitored VMs COMMAND_SHELL_DESCRIPTION = launches the Thermostat interactive shell COMMAND_VM_INFO_DESCRIPTION = shows basic information about a VM COMMAND_VM_STAT_DESCRIPTION = show various statistics about a VM COMMAND_VM_STAT_ARGUMENT_CONTINUOUS_DESCRIPTION = print data continuously COMMAND_CONNECT_DESCRIPTION = persistenly connect to a database COMMAND_CONNECT_ALREADY_CONNECTED = Already connected to storage. Please use disconnect command to disconnect. COMMAND_CONNECT_FAILED_TO_CONNECT = Could not connect to db {0} COMMAND_DISCONNECT_DESCRIPTION = disconnect from the currently used database COMMAND_DISCONNECT_NOT_CONNECTED = Not connected to storage. You may use the connect command for establishing connections. COMMAND_DISCONNECT_ERROR = Failed to disconnect from database. VM_INFO_PROCESS_ID = Process ID: VM_INFO_START_TIME = Start time: VM_INFO_STOP_TIME = Stop time: VM_INFO_MAIN_CLASS = Main class: VM_INFO_COMMAND_LINE = Command line: VM_INFO_JAVA_VERSION = Java version: VM_INFO_VIRTUAL_MACHINE = Virtual machine: VM_INFO_VM_ARGUMENTS = VM arguments: COLUMN_HEADER_HOST_ID = HOST_ID COLUMN_HEADER_HOST = HOST COLUMN_HEADER_VM_ID = VM_ID COLUMN_HEADER_VM_NAME = VM_NAME COLUMN_HEADER_VM_STATUS = STATUS COLUMN_HEADER_TIME = TIME COLUMN_HEADER_CPU_PERCENT = %CPU COLUMN_HEADER_MEMORY_PATTERN = MEM.{0} VM_STOP_TIME_RUNNING = <Running> VM_STATUS_ALIVE = RUNNING VM_STATUS_DEAD = EXITED