[Fedora-directory-commits] esc/src/app/xpcom rhCoolKey.cpp, 1.7, 1.8 rhICoolKey.idl, 1.6, 1.7

[Doctor Conrad]

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2642

Modified Files:
	rhCoolKey.cpp rhICoolKey.idl 
Log Message:
New log file support #206783, r. mharmsen.


Index: rhCoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhCoolKey.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rhCoolKey.cpp	7 May 2007 23:45:43 -0000	1.7
+++ rhCoolKey.cpp	7 Jun 2007 21:16:28 -0000	1.8
@@ -726,6 +726,14 @@
 
 }
 
+/* void CoolKeyInitializeLog (in string aPathName, in unsigned long aMaxLines); */
+NS_IMETHODIMP rhCoolKey::CoolKeyInitializeLog(const char *aPathName, PRUint32 aMaxLines)
+{
+    ::CoolKeyInitializeLog((char *)aPathName, aMaxLines);  
+
+    return NS_OK;
+}
+
 /* void CoolKeyLogMsg (in unsigned long aLogLevel, in string aMessage); */
 NS_IMETHODIMP rhCoolKey::CoolKeyLogMsg(PRUint32 aLogLevel, const char *aMessage)
 {
@@ -733,7 +741,8 @@
 
     if(aMessage && ((PRLogModuleLevel) aLogLevel >=  PR_LOG_NONE &&
aLogLevel <= PR_LOG_MAX))
     {
-        PR_LOG( coolKeyLog, (PRLogModuleLevel) aLogLevel, ("%s
%s",GetTStamp(tBuff,56),aMessage));    
+        ::CoolKeyLogMsg((PRLogModuleLevel) aLogLevel, "%s %s
\n",GetTStamp(tBuff,56),aMessage);
+        PR_LOG( coolKeyLog, (PRLogModuleLevel) aLogLevel, ("%s
%s",GetTStamp(tBuff,56),aMessage));
     }
 
     return NS_OK;
@@ -776,7 +785,7 @@
 {
 
     char tBuff[56];
-    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("%s Attempting to Enroll Key ,ID: %s
\n",GetTStamp(tBuff,56),aKeyID));
+    ::CoolKeyLogMsg( PR_LOG_ALWAYS, "%s Attempting to Enroll Key ,ID: %s
\n",GetTStamp(tBuff,56),aKeyID);
     
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
@@ -808,7 +817,7 @@
 NS_IMETHODIMP rhCoolKey::ResetCoolKeyPIN(PRUint32 aKeyType, const char *aKeyID, const
char *aScreenName, const char *aPIN, const char *aScreenNamePwd)
 {
     char tBuff[56];
-    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("%s Attempting to Reset Key PIN, ID: %s
\n",GetTStamp(tBuff,56),aKeyID));
+    ::CoolKeyLogMsg( PR_LOG_ALWAYS, "%s Attempting to Reset Key PIN, ID: %s
\n",GetTStamp(tBuff,56),aKeyID);
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
     if (!node)
@@ -859,7 +868,7 @@
 NS_IMETHODIMP rhCoolKey::FormatCoolKey(PRUint32 aKeyType, const char *aKeyID, const char
*aEnrollmentType, const char *aScreenName, const char *aPIN, const char *aScreenNamePWord,
const char *aTokenCode)
 {
     char tBuff[56];
-    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("%s Attempting to Format Key, ID: %s.
",GetTStamp(tBuff,56),aKeyID));
+    ::CoolKeyLogMsg( PR_LOG_ALWAYS, "%s Attempting to Format Key, ID: %s.
",GetTStamp(tBuff,56),aKeyID);
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
     if (!node)
@@ -1203,7 +1212,7 @@
 
     HRESULT res =  CoolKeyGetIssuerInfo(&key, (char *)&issuerInfo,256);
 
-     PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("%s Attempting to get the key's Issuer:
Key: %s, Issuer  %s. \n",GetTStamp(tBuff,56),aKeyID, (char *) issuerInfo));
+    ::CoolKeyLogMsg( PR_LOG_ALWAYS, "%s Attempting to get the key's Issuer: Key:
%s, Issuer  %s. \n",GetTStamp(tBuff,56),aKeyID, (char *) issuerInfo);
 
     if(res == S_OK)
     {


Index: rhICoolKey.idl
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhICoolKey.idl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rhICoolKey.idl	7 May 2007 23:45:43 -0000	1.6
+++ rhICoolKey.idl	7 Jun 2007 21:16:28 -0000	1.7
@@ -32,6 +32,7 @@
 
     void rhCoolKeyUnSetNotifyCallback(in rhIKeyNotify jsNotify);
 
+    void CoolKeyInitializeLog(in string aPathName, in unsigned long aMaxLines);
     void CoolKeyLogMsg(in unsigned long aLogLevel, in string aMessage);
     void BlinkCoolKey(in unsigned long aKeyType, in string aKeyID,in unsigned long
aRate,in unsigned long aDuration);