Bug 136773 Enable ldap logging on optimized builds. r/sr=dmose

directory/xpcom/base/public/nsLDAP.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * 
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the mozilla.org LDAP XPCOM SDK.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Mosedale <dmose@mozilla.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsError.h"
-#include "nspr.h"
-#include "nsILDAPErrors.h"
-
-#ifdef PR_LOGGING
-extern PRLogModuleInfo *gLDAPLogModule;	   // defn in nsLDAPProtocolModule.cpp
-#endif
-
-#define NS_LDAPCONNECTION_CONTRACTID "@mozilla.org/network/ldap-connection;1" 
-#define NS_LDAPOPERATION_CONTRACTID "@mozilla.org/network/ldap-operation;1" 
-#define NS_LDAPMESSAGE_CONTRACTID "@mozilla.org/network/ldap-message;1"
-#define NS_LDAPURL_CONTRACTID "@mozilla.org/network/ldap-url;1"

directory/xpcom/base/src/nsLDAPConnection.cpp

@@ -472,7 +472,10 @@ nsLDAPConnection::InvokeMessageCallback(LDAPMessage *aMsgHandle,
     nsCOMPtr<nsILDAPOperation> operation;
     nsCOMPtr<nsILDAPMessageListener> listener;
 
+#if defined(DEBUG)
+    // We only want this being logged for debug builds so as not to affect performance too much.
     PR_LOG(gLDAPLogModule, PR_LOG_DEBUG, ("InvokeMessageCallback entered\n"));
+#endif
 
     // get the message id corresponding to this operation
     //

directory/xpcom/base/src/nsLDAPInternal.h

@@ -36,6 +36,11 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+#ifdef MOZ_LOGGING
+// This has to be before the pre-compiled headers.
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
+
 #include "nsLDAP.h"
 
 #ifdef PR_LOGGING

directory/xpcom/base/src/nsLDAPMessage.cpp

@@ -467,6 +467,9 @@ NS_IMETHODIMP nsLDAPMessage::GetDn(nsACString& aDn)
         }
     }
 
+    PR_LOG(gLDAPLogModule, PR_LOG_DEBUG,
+           ("nsLDAPMessage::GetDn(): dn = '%s'", rawDn));
+
     aDn.Assign(rawDn);
     ldap_memfree(rawDn);
 
@@ -481,8 +484,11 @@ nsLDAPMessage::GetValues(const char *aAttr, PRUint32 *aCount,
 {
     char **values;
     
+#if defined(DEBUG)
+    // We only want this being logged for debug builds so as not to affect performance too much.
     PR_LOG(gLDAPLogModule, PR_LOG_DEBUG,
            ("nsLDAPMessage::GetValues(): called with aAttr = '%s'", aAttr));
+#endif
 
     values = ldap_get_values(mConnectionHandle, mMsgHandle, aAttr);
 
@@ -556,9 +562,12 @@ nsLDAPMessage::GetBinaryValues(const char *aAttr, PRUint32 *aCount,
 {
     struct berval **values;
 
+#if defined(DEBUG)
+    // We only want this being logged for debug builds so as not to affect performance too much.
     PR_LOG(gLDAPLogModule, PR_LOG_DEBUG,
            ("nsLDAPMessage::GetBinaryValues(): called with aAttr = '%s'", 
             aAttr));
+#endif
 
     values = ldap_get_values_len(mConnectionHandle, mMsgHandle, aAttr);
 

directory/xpcom/base/src/nsLDAPOperation.cpp

@@ -37,6 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsLDAPInternal.h"
 #include "nsLDAP.h"
 #include "nsLDAPOperation.h"
 #include "nsLDAPConnection.h"

directory/xpcom/base/src/nsLDAPProtocolModule.cpp

@@ -38,6 +38,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsLDAPInternal.h"
 #include "nsLDAPURL.h"
 #include "nsIGenericFactory.h"
 #include "nsLDAPConnection.h"

directory/xpcom/base/src/nsLDAPSecurityGlue.cpp

@@ -43,6 +43,7 @@
 //
 #ifdef MOZ_PSM
 
+#include "nsLDAPInternal.h"
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
 #include "nsIInterfaceRequestor.h"
@@ -50,7 +51,6 @@
 #include "nsISocketProvider.h"
 #include "nsISSLSocketControl.h"
 #include "nsMemory.h"
-#include "nsLDAPInternal.h"
 #include "plstr.h"
 #include "ldap.h"
 #include "ldappr.h"