/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5392

Added by berkley over 14 years ago

added a DataOneLogger for event notifications on the CN. The logger is called DataOneLogger and can be managed in the log4j.properties file

     ################################################################################
     # set the log level to WARN and the log should be printed to stdout.
     log4j.rootLogger=WARN, stdout
     log4j.rootLogger=FATAL, stdout
     #log4j.threshold=FATAL, ERROR, WARN, INFO
-...
     log4j.appender.replication.layout=org.apache.log4j.PatternLayout
     log4j.appender.replication.layout.ConversionPattern=@build.context@ %d{yyyyMMdd-HH:mm:ss}: [%p]: %m [%c]%n
     ############## DataOne Logger ###########################
     log4j.category.DataOneLogger=d1
     log4j.appender.d1=org.apache.log4j.FileAppender
     log4j.appender.d1.File = DataOneEventLog.txt
     log4j.appender.d1.DatePattern='.'yyyy-ww
     log4j.appender.d1.maxFileSize=100000KB
     log4j.appender.d1.maxBackupIndex=10
     log4j.appender.d1.threshold=info
     log4j.appender.d1.layout=org.apache.log4j.PatternLayout
     log4j.appender.d1.layout.ConversionPattern=@build.context@ %d{yyyyMMdd-HH:mm:ss}: [%p]: %m [%c]%n

         private MetacatHandler handler;
         private Hashtable<String, String[]> params;
         Logger logMetacat = null;
         private Logger logMetacat = null;
         private Logger logCrud = null;
         private String metacatUrl;
-...
         public CrudService() {
         //change crud service into a singleton.  dont pass servlet data structures here
             logMetacat = Logger.getLogger(CrudService.class);
             logCrud = Logger.getLogger("DataOneLogger");
             try
+            {
                 String server = PropertyService.getProperty("server.name");
-...
                 AuthToken token = new AuthToken(sessionid);
                 EventLog.getInstance().log(metacatUrl,
                         username, null, "authenticate");
                 logCrud.info("authenticate");
                 return token;
+            }
             catch(Exception e)
-...
                     logMetacat.error("Could not generate missing system metadata: " + e.getMessage());
+                }
+            }
             logCrud.info("generateMissingSystemMetadata");
+        }
         /**
-...
             logMetacat.debug("Returning from CrudService.create()");
             EventLog.getInstance().log(metacatUrl,
                     username, localId, "create");
             logCrud.info("create localId:" + localId + " guid:" + guid);
             return guid;
+        }
-...
                 String username = sessionData.getUserName();
                 EventLog.getInstance().log(metacatUrl,
                         username, im.getLocalId(guid.getValue()), "update");
                 logCrud.info("update localId:" + im.getLocalId(guid.getValue()) + " guid:" + guid);
                 return guid;
+            }
             catch(Exception e)
-...
                 String username = sessionData.getUserName();
                 EventLog.getInstance().log(metacatUrl,
                         username, im.getLocalId(id.getValue()), "setAccess");
                 logCrud.info("setAccess");
+            }
             catch(Exception e)
+            {
-...
           String username = sessionData.getUserName();
           EventLog.getInstance().log(metacatUrl,
                   username, null, "read");
           logCrud.info("listObjects");
           return ol;
+        }
-...
         public Identifier delete(AuthToken token, Identifier guid)
                 throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
                 NotImplemented {
             logCrud.info("delete");
             throw new NotImplemented("1000", "This method not yet implemented.");
+        }
-...
         public DescribeResponse describe(AuthToken token, Identifier guid)
                 throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
                 NotImplemented {
             logCrud.info("describe");
             throw new NotImplemented("1000", "This method not yet implemented.");
+        }
-...
                 String username = sessionData.getUserName();
                 EventLog.getInstance().log(metacatUrl,
                         username, im.getLocalId(guid.getValue()), "read");
                 logCrud.info("get localId:" + localId + " guid:" + guid);
                 return objectStream;
             } catch (McdbDocNotFoundException e) {
-...
         public Checksum getChecksum(AuthToken token, Identifier guid)
                 throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
                 InvalidRequest, NotImplemented {
             logCrud.info("getChecksum");
             throw new NotImplemented("1000", "This method not yet implemented.");
+        }
-...
         public Checksum getChecksum(AuthToken token, Identifier guid,
                 String checksumAlgorithm) throws InvalidToken, ServiceFailure,
                 NotAuthorized, NotFound, InvalidRequest, NotImplemented {
             logCrud.info("getChecksum");
             throw new NotImplemented("1000", "This method not yet implemented.");
+        }
-...
+            }
             log.setLogEntryList(logs);
             logCrud.info("getLogRecords");
             return log;
+        }
-...
                 String username = sessionData.getUserName();
                 EventLog.getInstance().log(metacatUrl,
                         username, im.getLocalId(guid.getValue()), "read");
                 logCrud.info("getSystemMetadata localId: " + localId + " guid:" + guid);
                 return sysmeta;
             } catch (McdbDocNotFoundException e) {
-...
                                 null, params, sessionData.getUserName(), sessionData.getGroupNames());
             //String outputS = new String(output.toByteArray());
             logMetacat.debug("CrudService.insertDocument - Metacat returned: " + result);
     //        if (!(outputS.indexOf("<success>") > 0 && outputS.indexOf(localId) > 0)) {
     //            throw new ServiceFailure(1190, outputS);
     //        }
             logMetacat.debug("Finsished inserting xml document with id " + localId);
             return localId;
+        }

     //  private static final AbstractDatabase dbAdapter = MetacatUtil.dbAdapter;
       private static Logger logReplication = Logger.getLogger("ReplicationLogging");
       private static Logger logMetacat = Logger.getLogger(ReplicationHandler.class);
       private static Logger logD1 = Logger.getLogger("DataOneLogger");
       private static int DOCINSERTNUMBER = 1;
       private static int DOCERRORNUMBER  = 1;
       private static int REVINSERTNUMBER = 1;
-...
            //return DBConnection
            DBConnectionPool.returnDBConnection(dbConn, serialNumber);
         }//finally
         logD1.info("replication.create localId:" + accNumber);
+      }
-...
            //return DBConnection
            DBConnectionPool.returnDBConnection(dbConn, serialNumber);
         }//finally
         logD1.info("replication.create localId:" + accNumber);
+      }
-...
            //return DBConnection
            DBConnectionPool.returnDBConnection(dbConn, serialNumber);
         }//finally
         logD1.info("replication.handleDeleteSingleDocument localId:" + docId);
+      }
       /* Handle updateLastCheckTimForSingleServer*/

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5392

Added by berkley over 14 years ago