Initial fix for OpenDJ-97: Very many minor problems with the error logging ...

Matthew Swift

13.23.2011 96eaa516a85e620a6b76a64ffbe71cdc6037e026

 opends/src/server/org/opends/server/replication/server/ReplicationServerHandler.java

@@ -252,6 +252,13 @@
        // (this will also warn our connected DSs of the new received info)
        replicationServerDomain.receiveTopoInfoFromRS(inTopoMsg, this, false);
      }

      Message message = INFO_REPLICATION_SERVER_CONNECTION_TO_RS
          .get(getReplicationServerId(), getServerId(),
              replicationServerDomain.getBaseDn(),
              session.getReadableRemoteAddress());
      logError(message);

      super.finalizeStart();

    }
@@ -360,11 +367,11 @@
                  // if the present RS has received changes regarding its
                  //     gen ID and so won't change without a reset
                  // then  we are just degrading the peer.
                  Message message = NOTE_BAD_GENERATION_ID_FROM_RS.get(
                    getServiceId(),
                    Integer.toString(serverId),
                    Long.toString(generationId),
                    Long.toString(localGenerationId));
                  Message message = WARN_BAD_GENERATION_ID_FROM_RS
                      .get(serverId,
                          session.getReadableRemoteAddress(),
                          generationId, getServiceId(),
                          getReplicationServerId(), localGenerationId);
                  logError(message);
                } else
                {
@@ -387,11 +394,11 @@
                  //         we have a nul state ?
                  // replicationServerDomain.
                  // setGenerationId(generationId, false);
                  Message message = NOTE_BAD_GENERATION_ID_FROM_RS.get(
                    getServiceId(),
                    Integer.toString(serverId),
                    Long.toString(generationId),
                    Long.toString(localGenerationId));
                  Message message = WARN_BAD_GENERATION_ID_FROM_RS
                      .get(serverId,
                          session.getReadableRemoteAddress(),
                          generationId, getServiceId(),
                          getReplicationServerId(), localGenerationId);
                  logError(message);
                }
              }
@@ -429,6 +436,12 @@
      if (inTopoMsg!=null)
        replicationServerDomain.receiveTopoInfoFromRS(inTopoMsg, this, false);

      Message message = INFO_REPLICATION_SERVER_CONNECTION_FROM_RS
          .get(getReplicationServerId(), getServerId(),
              replicationServerDomain.getBaseDn(),
              session.getReadableRemoteAddress());
      logError(message);

      super.finalizeStart();

    }
@@ -563,11 +576,10 @@
              // if the present RS has received changes regarding its
              //     gen ID and so won't change without a reset
              // then  we are just degrading the peer.
              Message message = NOTE_BAD_GENERATION_ID_FROM_RS.get(
                  getServiceId(),
                  Integer.toString(serverId),
                  Long.toString(generationId),
                  Long.toString(localGenerationId));
              Message message = WARN_BAD_GENERATION_ID_FROM_RS.get(
                  serverId, session.getReadableRemoteAddress(),
                  generationId, getServiceId(),
                  getReplicationServerId(), localGenerationId);
              logError(message);
            }
            else
@@ -591,11 +603,10 @@
              //         we have a nul state ?
              // replicationServerDomain.
              // setGenerationId(generationId, false);
              Message message = NOTE_BAD_GENERATION_ID_FROM_RS.get(
                  getServiceId(),
                  Integer.toString(serverId),
                  Long.toString(generationId),
                  Long.toString(localGenerationId));
              Message message = WARN_BAD_GENERATION_ID_FROM_RS.get(
                  serverId, session.getReadableRemoteAddress(),
                  generationId, getServiceId(),
                  getReplicationServerId(), localGenerationId);
              logError(message);
            }
          }