merge

oam/cloud/IDBInstanceCmds.sh

@@ -137,6 +137,9 @@ describeInstance() {
 	ec2-describe-instances -O $AmazonAccessKey -W $AmazonSecretKey --region $Region > $describeInstanceFile 2>&1
 }
 
+#call at start up
+describeInstance
+
 getInstance() {
 	if [ "$instance" != "" ]; then
 		echo $instance

procmgr/main.cpp

@@ -1700,6 +1700,7 @@ void pingDeviceThread()
 										processManager.recycleProcess(moduleName);
 									}
 
+									// return values = 'ip address' for running or rebooting, stopped or terminated
 									string currentIPAddr = oam.getEC2InstanceIpAddress(hostName);
 									if (currentIPAddr == "stopped")
 									{ // start instance
@@ -1754,7 +1755,7 @@ void pingDeviceThread()
 										}
 									}
 
-									if ( currentIPAddr == "terminated" || currentIPAddr == "running")
+									if ( currentIPAddr == "terminated")
 									{
 										//check if down module was Standby OAM, if so find another one
 										if ( moduleName == config.OAMStandbyName() ) {