Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TASK-1203 Use default AbstractHandleConstants.pm #39

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

TASK-1203 Use default AbstractHandleConstants.pm #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.mini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif

SERVICE_PSGI = $(SERVICE_NAME).psgi
NAMESPACE = KBH
TPAGE_ARGS = --define kb_runtime=$(RUNTIME) --define kb_runas_user=$(SERVICE_USER) --define kb_top=$(TARGET) --define kb_service_name=$(SERVICE_NAME) --define kb_service_config_stanza=$(SERVICE_CONFIG) --define kb_service_dir=$(SERVICE_DIR) --define kb_service_port=$(SERVICE_PORT) --define kb_psgi=$(SERVICE_PSGI) --define handle_namespace=$(NAMESPACE)
TPAGE_ARGS = --define kb_runtime=$(RUNTIME) --define kb_runas_user=$(SERVICE_USER) --define kb_top=$(TARGET) --define kb_service_name=$(SERVICE_NAME) --define kb_service_config_stanza=$(SERVICE_CONFIG) --define kb_service_dir=$(SERVICE_DIR) --define kb_service_port=$(SERVICE_PORT) --define kb_psgi=$(SERVICE_PSGI)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may be mostly cosmetic. I think the default may be defined in the build, and it's definitely explicitly set in the gitlab config (at least for CI).


deploy-service:
mkdir -p ./$(DESTDIR)/services/$(SERVICE_DIR)
Expand Down
4 changes: 2 additions & 2 deletions lib/Bio/KBase/AbstractHandle/AbstractHandleImpl.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Log::Log4perl->easy_init($DEBUG);
use Bio::KBase::HandleServiceConstants 'handleNameSpace';

our $namespace = handleNameSpace;
INFO "pid $$ using $namespace as the default handle namespace";
INFO "pid $$ using '$namespace' as the default handle namespace";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in this file are just for better logging, setting off the namespace in quotes, so that if it's undefined, we see '' instead of just whitespace.


our $cfg = {};
our ($default_shock, $mysql_host, $mysql_port, $mysql_user, $mysql_pass,
Expand All @@ -50,7 +50,7 @@ if (defined $ENV{KB_DEPLOYMENT_CONFIG} && -e $ENV{KB_DEPLOYMENT_CONFIG}) {
$data_source = $cfg->param('handle_service.data-source');
INFO "pid $$ reading config from $ENV{KB_DEPLOYMENT_CONFIG}";
INFO "pid $$ using $default_shock as the default shock server";
INFO "pid $$ using $namespace as the namespace for handles created by this service";
INFO "pid $$ using '$namespace' as the namespace for handles created by this service";
}
else {
die "pid $$ CRITICAL: could not find KB_DEPLOYMENT_CONFIG, exiting";
Expand Down