Pull request #445: Pr 4586 add channel id to log messages

Merge in MC/connect from pr-4586-add-channel-id-to-log-messages to development

* commit '6e5b8b7af617f304b3f800d5e45dbfe36abb4f8d':
  Update README.md
  Database Reader Logs: Show channel ID in log error messages when polling or initialization failed

README.md

@@ -1,4 +1,4 @@
-# NextGen Connect Integration Engine (formerly Mirth Connect)
+# Mirth Connect by NextGen Healthcare
 
 1. [Useful Links](#useful-links)
 2. [General Information](#general-information)

server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverQuery.java

@@ -111,7 +111,7 @@ private void initConnection() throws ConnectorTaskException {
  closeUpdateConnection();
 
  if (attempts++ < maxRetryCount) {
- logger.error("An error occurred while initializing the connection, retrying after " + retryInterval + " ms...", e);
+ logger.error("An error occurred while initializing the connection on channel " + connector.getChannelId() + ",  retrying after " + retryInterval + " ms...", e);
 
  // Wait the specified amount of time before retrying
  try {
@@ -204,7 +204,7 @@ public Object poll() throws DatabaseReceiverException, InterruptedException {
  DbUtils.closeQuietly(cachedRowSet);
 
  if (attempts++ < maxRetryCount && !connector.isTerminated()) {
- logger.error("An error occurred while polling for messages, retrying after " + retryInterval + " ms...", e);
+ logger.error("An error occurred while polling for messages on channel " + connector.getChannelId() + ", retrying after " + retryInterval + " ms...", e);
 
  // Wait the specified amount of time before retrying
  Thread.sleep(retryInterval);