import java.util.Timer;\r
import java.util.TimerTask;\r
import java.util.TreeSet;\r
-import org.apache.log4j.Logger;\r
+\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
import org.json.JSONException;\r
import org.json.JSONObject;\r
import org.json.JSONTokener;\r
private static final String POKE_URL_TEMPLATE = "http://%s/internal/fetchProv";\r
\r
private static final Object lock = new Object();\r
+ private static final String CARRIAGE_RETURN = "\n],\n";\r
\r
/**\r
* This is a singleton -- there is only one Poker object in the server\r
private long timer1;\r
private long timer2;\r
private String thisPod; // DNS name of this machine\r
- private Logger logger;\r
+ private EELFLogger logger;\r
private String provString;\r
\r
+\r
private Poker() {\r
timer1 = timer2 = 0;\r
Timer rolex = new Timer();\r
- logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
+ logger = EELFManager.getInstance().getLogger("InternalLog");;\r
try {\r
thisPod = InetAddress.getLocalHost().getHostName();\r
} catch (UnknownHostException e) {\r
- thisPod = "*UNKNOWN*"; // not a major problem\r
- logger.info("UnknownHostException: Setting thisPod to \"*UNKNOWN*\"");\r
+ thisPod = "*UNKNOWN_POD*"; // not a major problem\r
+ logger.info("UnknownHostException: Setting thisPod to \"*UNKNOWN_POD*\"", e);\r
}\r
provString = buildProvisioningString();\r
\r
} catch (MalformedURLException e) {\r
logger.warn(\r
"PROV0013 MalformedURLException Error poking node at " + nodeUrl + " : " + e\r
- .getMessage());\r
+ .getMessage(), e);\r
} catch (IOException e) {\r
logger.warn("PROV0013 IOException Error poking node at " + nodeUrl + " : " + e\r
- .getMessage());\r
+ .getMessage(), e);\r
}\r
};\r
r.run();\r
sb.append(f.asJSONObject().toString());\r
pfx = ",\n";\r
}\r
- sb.append("\n],\n");\r
+ sb.append(CARRIAGE_RETURN);\r
\r
//Append groups to the string - Rally:US708115 - 1610\r
pfx = "\n";\r
sb.append(s.asJSONObject().toString());\r
pfx = ",\n";\r
}\r
- sb.append("\n],\n");\r
+ sb.append(CARRIAGE_RETURN);\r
\r
// Append Subscriptions to the string\r
pfx = "\n";\r
}\r
pfx = ",\n";\r
}\r
- sb.append("\n],\n");\r
+ sb.append(CARRIAGE_RETURN);\r
\r
// Append Parameters to the string\r
pfx = "\n";\r
sb.append("\"parameters\": {");\r
Map<String, String> props = Parameters.getParameters();\r
- Set<String> ivals = new HashSet<String>();\r
+ Set<String> ivals = new HashSet<>();\r
String intv = props.get("_INT_VALUES");\r
if (intv != null) {\r
ivals.addAll(Arrays.asList(intv.split("\\|")));\r
sb.append(in.asJSONObject().toString());\r
pfx = ",\n";\r
}\r
- sb.append("\n],\n");\r
+ sb.append(CARRIAGE_RETURN);\r
\r
pfx = "\n";\r
sb.append("\"egress\": {");\r