Merge remote-tracking branch 'upstream/master' into wan_restore_update_2

Author: suvi-123

src/main.c

@@ -89,6 +89,9 @@ int main()
 		WebcfgDebug("RBUS mode. webconfigRbusInit\n");
 		webconfigRbusInit(WEBCFG_COMPONENT_NAME);
 		regWebConfigDataModel();
+		#ifdef WAN_FAILOVER_SUPPORTED
+		subscribeTo_CurrentActiveInterface_Event();
+		#endif
 		systemStatus = rbus_waitUntilSystemReady();
 		WebcfgDebug("rbus_waitUntilSystemReady systemStatus is %d\n", systemStatus);
     		getCurrent_Time(&cTime);
@@ -99,9 +102,6 @@ int main()
 		WanEventHandler();
 		// wait for upstream subscriber for 5mins
 		waitForUpstreamEventSubscribe(300);
-		#ifdef WAN_FAILOVER_SUPPORTED
-		subscribeTo_CurrentActiveInterface_Event();
-		#endif
 		ret = rbus_GetValueFromDB( PARAM_RFC_ENABLE, &strValue );
 		if (ret == 0)
 		{

src/webcfg_rbus.c

@@ -1926,7 +1926,7 @@ int set_rbus_ForceSync(char* pString, int *pStatus)
         }
 	else if(get_global_webcfg_forcedsync_started() ==1)
         {
-			WebcfgInfo("Webcfg forced sync is in progress, Ignoring this request & will retry later.\n");
+            WebcfgInfo("Webcfg forced sync is in progress, Ignoring this request & will retry later.\n");
             *pStatus = 1;
             return 0;
         }
@@ -2061,7 +2061,7 @@ void waitForUpstreamEventSubscribe(int wait_time)
 {
 	int count=0;
 	if(!subscribed)
-		WebcfgError("Waiting for %s event subscription for %ds\n", WEBCFG_UPSTREAM_EVENT, wait_time);
+		WebcfgInfo("Waiting for %s event subscription for %ds\n", WEBCFG_UPSTREAM_EVENT, wait_time);
 	while(!subscribed)
 	{
 		sleep(5);
@@ -2119,7 +2119,7 @@ static void subscribeAsyncHandler(
 int subscribeTo_CurrentActiveInterface_Event()
 {
       int rc = RBUS_ERROR_SUCCESS;
-      WebcfgDebug("Subscribing to %s Event\n", WEBCFG_INTERFACE_PARAM);
+      WebcfgInfo("Subscribing to %s Event\n", WEBCFG_INTERFACE_PARAM);
       rc = rbusEvent_SubscribeAsync (
         rbus_handle,
         WEBCFG_INTERFACE_PARAM,