Revision 6542
Added by ben leinfelder over 12 years ago
| CNodeService.java | ||
|---|---|---|
| 27 | 27 |
import java.util.List; |
| 28 | 28 |
import java.util.Set; |
| 29 | 29 |
|
| 30 |
import javax.servlet.http.HttpServletRequest; |
|
| 31 |
|
|
| 30 | 32 |
import org.apache.log4j.Logger; |
| 31 | 33 |
import org.dataone.client.CNode; |
| 32 | 34 |
import org.dataone.client.D1Client; |
| ... | ... | |
| 78 | 80 |
public class CNodeService extends D1NodeService implements CNAuthorization, |
| 79 | 81 |
CNCore, CNRead, CNReplication {
|
| 80 | 82 |
|
| 81 |
/* the instance of the CNodeService object */ |
|
| 82 |
private static CNodeService instance = null; |
|
| 83 |
|
|
| 84 | 83 |
/* the logger instance */ |
| 85 | 84 |
private Logger logMetacat = null; |
| 86 | 85 |
|
| 87 | 86 |
/** |
| 88 | 87 |
* singleton accessor |
| 89 | 88 |
*/ |
| 90 |
public static CNodeService getInstance() {
|
|
| 91 |
if (instance == null) {
|
|
| 92 |
|
|
| 93 |
instance = new CNodeService(); |
|
| 94 |
|
|
| 95 |
} |
|
| 96 |
|
|
| 97 |
return instance; |
|
| 89 |
public static CNodeService getInstance(HttpServletRequest request) {
|
|
| 90 |
return new CNodeService(request); |
|
| 98 | 91 |
} |
| 99 | 92 |
|
| 100 | 93 |
/** |
| 101 | 94 |
* Constructor, private for singleton access |
| 102 | 95 |
*/ |
| 103 |
private CNodeService() {
|
|
| 104 |
super(); |
|
| 96 |
private CNodeService(HttpServletRequest request) {
|
|
| 97 |
super(request);
|
|
| 105 | 98 |
logMetacat = Logger.getLogger(CNodeService.class); |
| 106 | 99 |
|
| 107 | 100 |
} |
| ... | ... | |
| 559 | 552 |
} |
| 560 | 553 |
|
| 561 | 554 |
logMetacat.debug("Returning from registerSystemMetadata");
|
| 562 |
EventLog.getInstance().log(null, session.getSubject().getValue(), guid.getValue(), "registerSystemMetadata");
|
|
| 555 |
EventLog.getInstance().log(request.getRemoteAddr(), request.getHeader("User-Agent"), session.getSubject().getValue(), guid.getValue(), "registerSystemMetadata");
|
|
| 563 | 556 |
return guid; |
| 564 | 557 |
} |
| 565 | 558 |
|
| ... | ... | |
| 625 | 618 |
} |
| 626 | 619 |
|
| 627 | 620 |
logMetacat.debug("Returning from updateSystemMetadata");
|
| 628 |
EventLog.getInstance().log(null, session.getSubject().getValue(), guid.getValue(), "updateSystemMetadata");
|
|
| 621 |
EventLog.getInstance().log(request.getRemoteAddr(), request.getHeader("User-Agent"), session.getSubject().getValue(), guid.getValue(), "updateSystemMetadata");
|
|
| 629 | 622 |
return true; |
| 630 | 623 |
} |
| 631 | 624 |
|
Also available in: Unified diff
add User-Agent logging to support D1 requirements