Add support for dancer configuration file and session location definition.

Author: olsonanl

Makefile

@@ -63,7 +63,7 @@ TPAGE_ARGS = --define kb_top=$(TARGET) \
 
 TESTS = $(wildcard t/client-tests/*.t)
 
-all: build-libs bin compile-typespec service
+all: build-libs bin compile-typespec service build-dancer-config
 
 build-libs:
 	$(TPAGE) $(TPAGE_ARGS) AppConfig.pm.tt > lib/Bio/KBase/AppService/AppConfig.pm
@@ -112,7 +112,7 @@ deploy: deploy-client deploy-service
 deploy-all: deploy-client deploy-service
 deploy-client: compile-typespec build-libs deploy-docs deploy-libs deploy-scripts 
 
-deploy-service: deploy-dir deploy-monit deploy-libs deploy-service-scripts
+deploy-service: deploy-dir deploy-monit deploy-libs deploy-service-scripts deploy-dancer-config
 	for script in start_service stop_service postinstall; do \
 		$(TPAGE) $(TPAGE_ARGS) service/$$script.tt > $(TARGET)/services/$(SERVICE)/$$script ; \
 		chmod +x $(TARGET)/services/$(SERVICE)/$$script ; \
@@ -122,6 +122,12 @@ deploy-service: deploy-dir deploy-monit deploy-libs deploy-service-scripts
 	ln -s ../services/$(SERVICE)/postinstall $(TARGET)/postinstall/$(SERVICE)
 	rsync -arv app_specs $(TARGET)/services/$(SERVICE)/.
 
+deploy-dancer-config:
+	$(TPAGE) --define deployment_flag=1 $(TPAGE_ARGS) dancer_config.yml.tt > $(TARGET)/services/$(SERVICE)/config.yml
+
+build-dancer-config:
+	$(TPAGE) $(TPAGE_ARGS) dancer_config.yml.tt > lib/Bio/KBase/AppService/config.yml
+
 deploy-service-scripts:
 	export KB_TOP=$(TARGET); \
 	export KB_RUNTIME=$(DEPLOY_RUNTIME); \

dancer_config.yml.tt

@@ -0,0 +1,13 @@
+session: "YAML"
+
+template: "template_toolkit"
+engines:
+  session:
+    YAML:
+[% IF kb_service_log_dir -%]
+      session_dir: "[% kb_service_log_dir %]/sessions"
+[% ELSIF deployment_flag -%]
+      session_dir: "[% kb_top %]/services/[% kb_service_name %]"
+[% ELSE -%]
+      session_dir: "./sessions"
+[% END -%]

lib/Bio/KBase/AppService/Monitor.pm

@@ -6,21 +6,16 @@ use Data::Dumper;
 use LWP::UserAgent;
 use HTTP::Headers;
 use JSON::XS;
+use File::Spec;
 use Bio::KBase::AppService::Awe;
 
 our $impl;
 our $json = JSON::XS->new->pretty;
 
-set session => 'YAML';
 set views => path(dirname(__FILE__), 'templates');
 set layout => 'main';
-set template => 'template_toolkit';
-set engines => {
-    template => {
-	template_toolkit => {
-	},
-    },
-};
+
+print Dumper(Monitor => config);
 
 sub set_impl
 {

lib/Bio/KBase/AppService/Quick.pm

@@ -12,6 +12,7 @@ use LWP::UserAgent;
 use HTTP::Headers;
 use JSON::XS;
 use MIME::Base64;
+use File::Spec;
 use Bio::KBase::AppService::Awe;
 use Bio::P3::Workspace::WorkspaceClientExt;
 use Bio::KBase::AppService::Client;
@@ -23,19 +24,12 @@ our $json = JSON::XS->new->pretty;
 our %token_cache;
 our $validator = P3TokenValidator->new();
 
-set session => 'YAML';
 set views => path(dirname(__FILE__), 'templates');
-set layout => undef;
-set template => 'template_toolkit';
-set engines => {
-    template => {
-	template_toolkit => {
-	},
-    },
-};
 set content_type => 'text/plain';
 set error_template => undef;
 
+print Dumper(Quick => config);
+
 sub set_impl
 {
     my($i) = @_;

service/start_service.tt

@@ -14,6 +14,11 @@ export KB_DEPLOYMENT_CONFIG="$KB_TOP/deployment.cfg"
 # For phispy
 export R_LIBS="$KB_TOP/lib"
 
+#
+# Dancer apps config dir
+#
+export DANCER_CONFDIR="$KB_TOP/services/[% kb_service_name %]"
+
 [% IF kb_tempdir -%]
 export TMPDIR=[% kb_tempdir %]
 export TEMPDIR=[% kb_tempdir %]