fetching configuration from CBS at application bootstrap

Change-Id: Ibaa56c38b87fc8b8cfa858f74b7bc201bd507b37
Issue-ID: DCAEGEN2-1544
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>

5 files changed, 32 insertions, 15 deletions

diff --git a/prh-app-server/src/main/resources/META-INF/spring.factories b/prh-app-server/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..78fde6e2
--- /dev/null
+++ b/prh-app-server/src/main/resources/META-INF/spring.factories
@@ -0,0 +1 @@
+org.springframework.cloud.bootstrap.BootstrapConfiguration=org.onap.dcaegen2.services.bootstrap.CbsBootstrapConfiguration
\ No newline at end of file
diff --git a/prh-app-server/src/main/resources/application.yaml b/prh-app-server/src/main/resources/application.yaml
index 8139036c..2d244887 100644
--- a/prh-app-server/src/main/resources/application.yaml
+++ b/prh-app-server/src/main/resources/application.yaml
@@ -10,13 +10,16 @@ server:
     key-password: nokiapnf
     keyAlias: tomcat-localhost
 
-management.endpoints.web.exposure.include: "loggers"
-
+management.endpoints.web.exposure.include: "loggers,refresh,env,health"
 
 ---
 spring:
   profiles: dev
 logging:
   level:
-    org.onap.dcaegen2.services.prh: info
-    org.onap.dcaegen2.services.sdk: info
\ No newline at end of file
+    org.onap.dcaegen2.services.prh: debug
+    org.onap.dcaegen2.services.sdk: debug
+
+management.endpoints.web.exposure.include: "*"
+
+
diff --git a/prh-app-server/src/main/resources/bootstrap.yaml b/prh-app-server/src/main/resources/bootstrap.yaml
new file mode 100644
index 00000000..176c6bec
--- /dev/null
+++ b/prh-app-server/src/main/resources/bootstrap.yaml
@@ -0,0 +1,23 @@
+spring:
+  application:
+    name: dcae-prh
+
+  cloud:
+    config:
+      enabled: false
+
+
+logging:
+  level:
+    org.springframework.boot.SpringApplication: warn
+    org.springframework.context.support.PostProcessorRegistrationDelegate: warn
+
+cbs:
+  hostname: cbs
+  port: 10000
+  app-name: dcae-prh
+  updates-interval: 5m
+  fetch-retries:
+    max-attempts: 10
+    first-backoff: 3s
+    max-backoff: 15s
\ No newline at end of file
diff --git a/prh-app-server/src/main/resources/cbs_client_config.json b/prh-app-server/src/main/resources/cbs_client_config.json
deleted file mode 100644
index 0f196a1e..00000000
--- a/prh-app-server/src/main/resources/cbs_client_config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "hostname": "cbs",
-  "port": 10000,
-  "appName": "dcae-prh"
-}
\ No newline at end of file
diff --git a/prh-app-server/src/main/resources/logback-spring.xml b/prh-app-server/src/main/resources/logback-spring.xml
index 03f4a103..060cf6c5 100644
--- a/prh-app-server/src/main/resources/logback-spring.xml
+++ b/prh-app-server/src/main/resources/logback-spring.xml
@@ -16,8 +16,6 @@
     |%replace(%replace(%marker){'\t','\\\\t'}){'\n','\\\\n'}
     |%thread
     |%n"/>
-  <variable name="logLevel" value="${LOG_LEVEL:-ERROR}"/>
-  <variable name="logLevelPrh" value="${PRH_LOG_LEVEL:-WARN}"/>
 
   <springProfile name="prod">
     <appender class="ch.qos.logback.core.ConsoleAppender" name="CONSOLE" target="SYSTEM_OUT">
@@ -39,10 +37,7 @@
       </rollingPolicy>
     </appender>
 
-    <logger name="org.onap.dcaegen2.services.prh" level="${logLevelPrh}"/>
-    <logger name="org.onap.dcaegen2.services.sdk" level="${logLevelPrh}"/>
-
-    <root level="${logLevel}">
+    <root level="INFO">
       <appender-ref ref="CONSOLE"/>
       <appender-ref ref="ROLLING-FILE"/>
     </root>