Misc updates to collector

Change-Id: I7a3b52c454442d6a9f93331142b78bf671ffcd0a
Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
Issue-ID: DCAEGEN2-373

1 files changed, 53 insertions, 47 deletions

diff --git a/src/main/scripts/docker-entry.sh b/src/main/scripts/docker-entry.sh
index 3b73005f..96cb088c 100644
--- a/src/main/scripts/docker-entry.sh
+++ b/src/main/scripts/docker-entry.sh
@@ -1,47 +1,53 @@
-#!/bin/sh
-###
-# ============LICENSE_START=======================================================
-# PROJECT
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-if [ ! -z "$COLLECTOR_IP" ]; then
-        echo $COLLECTOR_IP  $(hostname).dcae.simpledemo.onap.org >> /etc/hosts
-fi
-
-if [ ! -z "$DMAAPHOST" ]; then
-        if [ -z "$(echo $DMAAPHOST | sed -e 's/[0-9\.]//g')" ]; then 
-                echo "$DMAAPHOST  onap-dmaap" >> /etc/hosts
-        else
-                echo "onap-dmaap $DMAAPHOST" >> /etc/host.aliases
-        fi
-else
-	echo "DMAAPHOST ENV NOT SET!! PUBLISH WILL NOT BE SUPPORTED"
-fi
-
-if [ -z "$CONSUL_HOST" ] || [ -z "$CONFIG_BINDING_SERVICE" ] || [ -z "$HOSTNAME" ]; then
-                echo "INFO: USING STANDARD ALONE CONFIGURATION SETUP"
-		## For Container supporting both classic and GEN2 controller - below line should be uncommented, provided service manager package is included
-		#/opt/app/manager/start-manager.sh
-else
-                echo "INFO: USING DCAEGEN2 CONTROLLER"
-fi
-
-/opt/app/VESCollector/bin/VESrestfulCollector.sh stop
-/opt/app/VESCollector/bin/VESrestfulCollector.sh start &
-
-while true; do sleep 1000; done
+#!/bin/sh

+###

+# ============LICENSE_START=======================================================

+# PROJECT

+# ================================================================================

+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.

+# ================================================================================

+# Licensed under the Apache License, Version 2.0 (the "License");

+# you may not use this file except in compliance with the License.

+# You may obtain a copy of the License at

+#

+#      http://www.apache.org/licenses/LICENSE-2.0

+#

+# Unless required by applicable law or agreed to in writing, software

+# distributed under the License is distributed on an "AS IS" BASIS,

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+# See the License for the specific language governing permissions and

+# limitations under the License.

+# ============LICENSE_END=========================================================

+###

+

+if [ ! -z "$COLLECTOR_IP" ]; then

+        echo $COLLECTOR_IP  $(hostname).dcae.simpledemo.onap.org >> /etc/hosts

+fi

+

+if [ ! -z "$DMAAPHOST" ]; then

+        if [ -z "$(echo $DMAAPHOST | sed -e 's/[0-9\.]//g')" ]; then 

+                echo "$DMAAPHOST  onap-dmaap" >> /etc/hosts

+        else

+                echo "onap-dmaap $DMAAPHOST" >> /etc/host.aliases

+        fi

+else

+	echo "DMAAPHOST ENV NOT SET!! PUBLISH WILL NOT BE SUPPORTED"

+fi

+

+if [ -z "$CONSUL_HOST" ] || [ -z "$CONFIG_BINDING_SERVICE" ] || [ -z "$HOSTNAME" ]; then

+                echo "INFO: USING STANDARD ALONE CONFIGURATION SETUP"

+		## For Container supporting both classic and GEN2 controller - below line should be uncommented, provided service manager package is included

+		#/opt/app/manager/start-manager.sh

+else

+                echo "INFO: USING DCAEGEN2 CONTROLLER"

+fi

+

+/opt/app/VESCollector/bin/VESrestfulCollector.sh stop

+/opt/app/VESCollector/bin/VESrestfulCollector.sh start &

+

+# Add below if config polling should be enabled

+# More specific to K8 deployment in ONAP

+if [ ! -z "$CBSPOLLTIMER" ]; then

+	/opt/app/VESCollector/bin/VESConfigPoller.sh &

+fi

+

+while true; do sleep 1000; done