--- a/webservices/idwsfplugin/src/idwsfservicesession.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/idwsfplugin/src/idwsfservicesession.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -1313,6 +1313,7 @@
{
iSubmitState = KSubmitStateOK;
}
+ CSLOG_FORMAT((aConsumer.ConnectionId(), KNormalLogLevel , _L8("CIdWsfServiceSession::SubmitL [%d]: "), retVal));
return retVal;
}
--- a/webservices/wsconnection/group/senserviceconnection.mmp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wsconnection/group/senserviceconnection.mmp Tue Sep 14 23:25:14 2010 +0300
@@ -86,6 +86,8 @@
LIBRARY euser.lib
LIBRARY flogger.lib
LIBRARY efsrv.lib
+LIBRARY bafl.lib
+
#ifndef RD_SEN_COMPILE_SIS_PACKAGE_FILES
// SOA for S60 libs:
LIBRARY wsconnagent.lib
--- a/webservices/wsconnection/src/senserviceconnectionimpl.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wsconnection/src/senserviceconnectionimpl.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -20,6 +20,7 @@
#include <s32strm.h>
#include <f32file.h>
#include <e32property.h>
+#include <bautils.h>
#include "senserviceconnectionimpl.h"
@@ -192,6 +193,21 @@
void CSenServiceConnectionImpl::ConstructL(MSenServiceDescription& aSD)
{
+ #ifdef _SENDEBUG
+ #ifdef _DEBUG
+
+ RFs fs;
+ fs.Connect();
+ TBool ret = BaflUtils::FolderExists(fs, _L("c:\\logs\\wslog\\"));
+ if(!ret)
+ {
+ fs.MkDirAll(_L("c:\\logs\\wslog\\"));
+ }
+ fs.Close();
+
+ #endif // _DEBUG
+ #endif // _SENDEBUG
+
TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"CSenServiceConnectionImpl::ConstructL(aSD)");
CSenElement& sdAsElement = ((CSenXmlServiceDescription&)aSD).AsElement();
@@ -3517,6 +3533,7 @@
void CSenServiceConnectionImpl::DeliverStatus(TInt aStatus)
{
+ TLSLOG(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel,(_L("CSenServiceConnectionImpl::DeliverStatus()")));
TLSLOG_FORMAT((KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel , _L8("Invoking SetStatus(%d) callback."), aStatus ));
TLSLOG_FORMAT(( iTlsLogStatusChannel, KSenServiceConnectionStatusLogLevel, _L8("CSenServiceConnectionImpl::DeliverStatus [legacy status update] - Invoking SetStatus(%d)"), aStatus ));
--- a/webservices/wscore/src/senclientsession.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wscore/src/senclientsession.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -5111,6 +5111,7 @@
pTransport = ipTransport;
}
}
+ CSLOG_L(iConnectionID,KMinLogLevel ,"CSenClientSession::TransportL() Completed");
return *pTransport;
}
--- a/webservices/wscore/src/sencoreservicemanager.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wscore/src/sencoreservicemanager.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -203,7 +203,7 @@
CSenCoreServiceManager::~CSenCoreServiceManager()
{
-
+ TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenCoreServiceManager::~CSenCoreServiceManager()");
// Delete member variables
CSenCoreServiceManager::SetShowPasswordDialog(EFalse);
delete ipServerContext;
@@ -226,6 +226,7 @@
// }
#ifdef _SENDEBUG
+ TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenCoreServiceManager::~CSenCoreServiceManager() Completed");
TLSLOG_CLOSE(KSenFaultsLogChannel);
TLSLOG_CLOSE(KSenUtilsLogChannel);
TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"Log file closed.");
@@ -580,14 +581,14 @@
TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"- Shutdown timer cancelled, serving emerged new client.");
}
iConnectionCount++;
- TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KNormalLogLevel, _L8("- Client count increased to: %d"),iConnectionCount));
+ TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMinLogLevel, _L8("- Client count increased to: %d"),iConnectionCount));
}
void CSenCoreServiceManager::DecrementConnections()
{
- TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KNormalLogLevel,"CSenCoreServiceManager::DecrementConnections");
+ TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"CSenCoreServiceManager::DecrementConnections");
iConnectionCount--;
- TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KNormalLogLevel, _L8("- Client count decreased to: %d"),iConnectionCount));
+ TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMinLogLevel, _L8("- Client count decreased to: %d"),iConnectionCount));
if (iConnectionCount <= 0)
{
if( iShutdownTimer )
@@ -1201,6 +1202,7 @@
TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"- About to instantiate new transport (arg: ctx)");
// default to HTTP Channel transport plug-in:
TRAP( leaveCode, pTransport = CSenTransport::NewL(pCtx); )
+ TLSLOG_L(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,"- About to instantiate new transport (arg: ctx) 1");
if( leaveCode )
{
TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase , KMinLogLevel, _L8("- Could not load new transport plugin, leave: %d"),leaveCode));
--- a/webservices/wshostletconnection/group/senhostletconnection.mmp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wshostletconnection/group/senhostletconnection.mmp Tue Sep 14 23:25:14 2010 +0300
@@ -78,6 +78,8 @@
// System libs
LIBRARY euser.lib
LIBRARY flogger.lib
+LIBRARY bafl.lib
+LIBRARY efsrv.lib
#ifndef RD_SEN_COMPILE_SIS_PACKAGE_FILES
// SOA for S60 libs:
--- a/webservices/wshostletconnection/src/senhostletconnectionimpl.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wshostletconnection/src/senhostletconnectionimpl.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -26,6 +26,7 @@
#include <s32strm.h>
+#include <bautils.h>
#include <SenXmlUtils.h>
//#include "SenHostletConnectionLog.h"
@@ -78,6 +79,27 @@
void CSenHostletConnectionImpl::ConstructL()
{
+ #ifdef _SENDEBUG
+ #ifdef _DEBUG
+
+ RFs fs;
+ fs.Connect();
+ TBool ret = BaflUtils::FolderExists(fs, _L("c:\\logs\\wslog\\"));
+ if(!ret)
+ {
+ fs.MkDirAll(_L("c:\\logs\\wslog\\"));
+ }
+ fs.Close();
+
+ RFileLogger log;
+ log.Connect();
+ log.CreateLog(KSenHostletConnectionLogDir(), KSenHostletConnectionLogFile, EFileLoggingModeOverwrite);
+ log.CloseLog();
+ log.Close();
+
+ #endif // _DEBUG
+ #endif // _SENDEBUG
+
TInt connErr = iConnection.Connect();
TInt connAttemp(0); // max 5 attempts are allowed
while ( (connErr == KErrServerTerminated || connErr == KErrServerBusy)
--- a/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -74,6 +74,8 @@
CSenHttpChannelImpl::CSenHttpChannelImpl(MSenIdentityManager& aManager)
:
iIapId(KErrNone),
+ iUsedIapId(KErrNone),
+ iSnapId(KErrNone),
iManager(aManager),
iSessionAuthentication(NULL),
iPasswordFromUser(EFalse),
@@ -744,19 +746,23 @@
}
else if(((aProps.SnapIdL(id)) == KErrNone))
{
+ TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::InvokeHttpMethodL SetSnapPrefsL - Snap Id [%d]"), id));
retVal = SetSnapPrefsL(id, prompt, iConnection, iSockServ);
}
else//to better control RConnection, we have to call Start by ourselve
{
+ TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::InvokeHttpMethodL - No Snap Id and No Iap Id");
retVal = SetSnapPrefsL(0, EFalse, iConnection, iSockServ);
if(retVal == KErrNotFound)
{
if(iOCCenabled == EFalse)
{
+ TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::InvokeHttpMethodL - iOCCenabled EFalse calling SetIapPrefsL");
retVal = SetIapPrefsL(0, EFalse, iConnection, iSockServ);
}
else
{
+ TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::InvokeHttpMethodL - iOCCenabled ETrue calling SetSnapPrefsL");
retVal = SetSnapPrefsL(0, prompt, iConnection, iSockServ);
}
}
@@ -1288,7 +1294,7 @@
TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"GetCredentialsL() returning EFalse");
return EFalse; // decision: we could not save info into database, abort
}
- TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"--- New IDP registeration OK. Proceeding.");
+ TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"New IDP registeration OK. Proceeding.");
}
// we have credentials
TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"--- we have credentials");
@@ -1296,7 +1302,7 @@
aRealm.Pool().OpenStringL(iSessionAuthentication->AuthzID()));
TRAP(err, aPassword =
aRealm.Pool().OpenStringL(iSessionAuthentication->Password()));
- TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("--- username (%s), password (%d)"), aUsername, aPassword));
+ TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("--- username (%S), password (%S)"), &aUsername.DesC(), &aPassword.DesC()));
TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"GetCredentialsL() returning ETrue");
return ETrue;
}
@@ -1409,6 +1415,7 @@
++fields;
}
CleanupStack::Pop(tp);
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::HandleResponseHeadersL() returns")));
return;
}
@@ -1441,6 +1448,7 @@
break;
default:
{
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::HandleResponseHeadersL() User::Panic")));
User::Panic(KUnrecognisedValueTypeOfContentTypePanicText,
EContentTypeUnrecognisedValueType);
}
@@ -1485,6 +1493,7 @@
{
iXopResponse = ETrue;
content.Close();
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::HandleResponseHeadersL() returns")));
return;
}
}
@@ -1496,12 +1505,14 @@
{
iContentType.Set(fieldValPtr);
content.Close();
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::HandleResponseHeadersL() returns")));
return;
}
}
iHasHttpContentType = EFalse;
content.Close();
}
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::HandleResponseHeadersL() Completed")));
}
TInt CSenHttpChannelImpl::ContentTypeParamValueL(const RHTTPHeaders& aResponseHeaders,
@@ -1591,6 +1602,7 @@
DeleteTxnState(txnId);
aTransaction.Close();
}
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::HandleResponseBodyDataL() Completed")));
}
void CSenHttpChannelImpl::HandleResponseL(RHTTPTransaction aTransaction)
@@ -1625,14 +1637,15 @@
DeleteTxnState(txnId);
aTransaction.Close();
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpChannelImpl::HandleResponseL() Completed")));
}
void CSenHttpChannelImpl::HandleRunErrorL(RHTTPTransaction aTransaction,
TInt aError)
{
- TLSLOG_L(KSenHttpChannelLogChannelBase , KMaxLogLevel,"CSenHttpChannelImpl::HandleRunErrorL()");
+ TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::HandleRunErrorL()");
TInt txnId = aTransaction.Id();
- TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::HandleRunErrorL( %d ): %d"),txnId, aError));
+ TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpChannelImpl::HandleRunErrorL( )- Txn Id [%d], Error Id [%d]"),txnId, aError));
CSenTxnState* pTxnState = FindTxnState(txnId);
__ASSERT_ALWAYS(pTxnState != NULL,
User::Panic(KTxnStateNullPanicText,
@@ -1641,7 +1654,7 @@
pTxnState->ResponseErrorL(aError);
DeleteTxnState(txnId);
aTransaction.Close();
- TLSLOG_L(KSenHttpChannelLogChannelBase , KMaxLogLevel,"CSenHttpChannelImpl::HandleRunErrorL() Completed");
+ TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::HandleRunErrorL() Completed");
}
void CSenHttpChannelImpl::HandleRedirectRequiresConfirmationL(
@@ -1657,6 +1670,7 @@
pTxnState->ResponseErrorL(KErrSenHttpRedirectRequiresConfirmation); // was: -20002
DeleteTxnState(txnId);
aTransaction.Close();
+ TLSLOG_L(KSenHttpChannelLogChannelBase , KMinLogLevel,"CSenHttpChannelImpl::HandleRedirectRequiresConfirmationL() Completed");
}
/*
RFileLogger* CSenHttpChannelImpl::Log() const
--- a/webservices/wshttpchanneltransportplugin/src/senhttpeventhandler.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wshttpchanneltransportplugin/src/senhttpeventhandler.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -80,7 +80,7 @@
void CSenHttpEventHandler::MHFRunL(RHTTPTransaction aTransaction,
const THTTPEvent& aEvent)
{
- TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KNormalLogLevel, _L8("CSenHttpEventHandler::MHFRunL( %d )"), aEvent.iStatus));
+ TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpEventHandler::MHFRunL( %d )"), aEvent.iStatus));
if (aEvent.iStatus < 0)
{
if (aEvent.iStatus == KErrDisconnected)
@@ -97,42 +97,57 @@
iHttpChannel->SetExplicitIapDefined(EFalse);
iHttpChannel->HandleRunErrorL(aTransaction, aEvent.iStatus);
}
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() returns")));
return;
}
-
+ TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KMinLogLevel, _L8("CSenHttpEventHandler::statuscode( %d )"), aTransaction.Response().StatusCode()));
switch (aEvent.iStatus)
{
case THTTPEvent::EGotResponseHeaders:
- TLSLOG_FORMAT((KSenHttpChannelLogChannelBase , KNormalLogLevel, _L8("CSenHttpEventHandler::statuscode( %d )"),
- aTransaction.Response().StatusCode()));
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() EGotResponseHeaders")));
iHttpChannel->HandleResponseHeadersL(aTransaction);
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() EGotResponseHeaders Completed")));
break;
case THTTPEvent::EGotResponseBodyData:
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() EGotResponseBodyData")));
iHttpChannel->HandleResponseBodyDataL(aTransaction);
iTries = 0;
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() EGotResponseBodyData Completed")));
break;
case THTTPEvent::EResponseComplete:
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() EResponseComplete")));
break;
case THTTPEvent::ESucceeded:
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() ESucceeded")));
iHttpChannel->HandleResponseL(aTransaction);
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() ESucceeded Completed")));
break;
case THTTPEvent::EFailed:
case THTTPEvent::EMoreDataReceivedThanExpected:
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() EMoreDataReceivedThanExpected | EFailed")));
iHttpChannel->HandleRunErrorL(aTransaction,
aTransaction.Response().StatusCode());
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() EMoreDataReceivedThanExpected | EFailed Completed")));
break;
case THTTPEvent::EUnrecoverableError:
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() EUnrecoverableError")));
iHttpChannel->HandleRunErrorL(aTransaction, KErrNoMemory);
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() EUnrecoverableError Completed")));
break;
case THTTPEvent::ERedirectRequiresConfirmation:
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() ERedirectRequiresConfirmation")));
iHttpChannel->HandleRedirectRequiresConfirmationL(aTransaction);
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() ERedirectRequiresConfirmation Completed")));
break;
case THTTPEvent::ERedirectedPermanently:
case THTTPEvent::ERedirectedTemporarily:
case THTTPEvent::EGotResponseTrailerHeaders:
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() ERedirectedPermanently | ERedirectedTemporarily | EGotResponseTrailerHeaders")));
break;// We don't process this event
default:
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() default:")));
iHttpChannel->HandleRunErrorL(aTransaction, aEvent.iStatus);
+ TLSLOG(KSenHttpChannelLogChannelBase , KMinLogLevel,(_L("CSenHttpEventHandler::MHFRunL() default: Completed")));
break;
}
if (aTransaction.Response().StatusCode() == 401 && iTries < 4)
--- a/webservices/wslocaltransportplugin/src/senlocaltransportplugin.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wslocaltransportplugin/src/senlocaltransportplugin.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -137,6 +137,7 @@
MSenCoreServiceManager& core = Context().GetCoreL();
ipRequester = CSenSyncRequester::NewL(*this, core);
ipTransportProperties = CSenLayeredTransportProperties::NewL();
+ TLSLOG_L(KSenLocalTransportLogChannelBase,KMinLogLevel,"CSenLocalTransportPlugin::ConstructL Completed");
}
TInt CSenLocalTransportPlugin::SubmitL(const TDesC8& aEndpoint,
--- a/webservices/wsmanager/group/senservicemanager.mmp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wsmanager/group/senservicemanager.mmp Tue Sep 14 23:25:14 2010 +0300
@@ -78,6 +78,8 @@
LIBRARY euser.lib
LIBRARY flogger.lib
+LIBRARY bafl.lib
+LIBRARY efsrv.lib
#ifndef RD_SEN_COMPILE_SIS_PACKAGE_FILES
LIBRARY SenServDesc.lib
--- a/webservices/wsmanager/src/rsenservicemanager.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wsmanager/src/rsenservicemanager.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -199,8 +199,10 @@
TIpcArgs args;
args.Set(0, &aMessage);
args.Set(1, length);
-
- return SendReceive(ESenServRegisterIdentityProvider, args);
+ TInt retVal(KErrNone);
+ retVal = SendReceive(ESenServRegisterIdentityProvider, args);
+ TLSLOG_FORMAT((iTLSLogChannel, KNormalLogLevel , _L8("RSenServiceManager::RegisterIdentityProvider() returns [%d]"), retVal));
+ return retVal;
}
TInt RSenServiceManager::UnregisterIdentityProvider(TDesC8& aMessage)
--- a/webservices/wsmanager/src/senservicemanagerimpl.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wsmanager/src/senservicemanagerimpl.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -23,6 +23,8 @@
// INCLUDE FILES
+#include <bautils.h>
+
#include "senservicemanagerimpl.h"
#include <SenIdentityProvider.h>
@@ -76,6 +78,27 @@
void CSenServiceManagerImpl::ConstructL()
{
+ #ifdef _SENDEBUG
+ #ifdef _DEBUG
+
+ RFs fs;
+ fs.Connect();
+ TBool ret = BaflUtils::FolderExists(fs, _L("c:\\logs\\wslog\\"));
+ if(!ret)
+ {
+ fs.MkDirAll(_L("c:\\logs\\wslog\\"));
+ }
+ fs.Close();
+
+ RFileLogger log;
+ log.Connect();
+ log.CreateLog(KSenServiceManagerLogDir(), KSenServiceManagerLogFile, EFileLoggingModeOverwrite);
+ log.CloseLog();
+ log.Close();
+
+ #endif // _DEBUG
+ #endif // _SENDEBUG
+
TInt connAttemp = 0;
TInt connErr = KErrGeneral;
@@ -390,7 +413,7 @@
TInt retVal = iConnection.RegisterIdentityProvider(ptr);
delete provider;
provider = NULL;
- TLSLOG_L(KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel,"CSenServiceManagerImpl::RegisterIdentityProviderL(aProvider) Completed");
+ TLSLOG_FORMAT((KSenServiceManagerLogChannelBase+iConnectionID, KMinLogLevel , _L8("CSenServiceManagerImpl::RegisterIdentityProviderL(aProvider) returns [%d]"), retVal));
return retVal;
}
--- a/webservices/wsoviplugin/src/wsoviservicesession.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wsoviplugin/src/wsoviservicesession.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -737,15 +737,22 @@
TLSLOG_FORMAT((KSenClientSessionLogChannelBase+aConsumer.ConnectionId(), KMinLogLevel , _L8("- ErrorCode: %d"), aErrorCode ));
((CWSOviPlugin&)iFramework).ProcessInboundDispatchL(this, aErrorCode, apError, aResponseTransportProperties);
TInt answer = CanHandleErrorL();
+ TInt retVal(KErrNone);
if (answer)
{
- delete apError;
- return aConsumer.HandleErrorL(NULL, answer, aTxnId, aResponseTransportProperties);
+ if(apError)
+ {
+ delete apError;
+ apError = NULL;
+ }
+ retVal = aConsumer.HandleErrorL(NULL, answer, aTxnId, aResponseTransportProperties);
}
else
{
- return HandleErrorL(aErrorCode, apError, aTxnId, aConsumer, aResponseTransportProperties);
+ retVal = HandleErrorL(aErrorCode, apError, aTxnId, aConsumer, aResponseTransportProperties);
}
+ TLSLOG_FORMAT((KSenClientSessionLogChannelBase+aConsumer.ConnectionId(), KMinLogLevel , _L8("CWSOviServiceSession::SendErrorToConsumerL() retruns [%d]"), retVal ));
+ return retVal;
}
--- a/webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp Wed Sep 01 12:28:05 2010 +0100
+++ b/webservices/wsoviplugin/src/wsoviserviceupdatehandler.cpp Tue Sep 14 23:25:14 2010 +0300
@@ -110,6 +110,7 @@
{
case MSenProperties::ESenHttpTransportProperties:
{
+ TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("----- ESenHttpTransportProperties")));
TInt minutes;
((CSenHttpTransportProperties*)tp)->IntPropertyL(WSOviSession::KDateHttpHeader(), minutes);
pCtx.Update(WSOviContextKeys::KRetryNeeded, minutes);
@@ -117,11 +118,13 @@
break;
case MSenProperties::ESenLayeredHttpTransportProperties:
{
+ TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("----- ESenLayeredHttpTransportProperties")));
TInt minutes;
((CSenLayeredHttpTransportProperties*)tp)->IntPropertyL(WSOviSession::KDateHttpHeader(), minutes);
pCtx.Update(WSOviContextKeys::KRetryNeeded, minutes);
}
default:
+ TLSLOG(KSenCoreServiceManagerLogChannelBase , KMinLogLevel,(_L("----- Default")));
break;
}
}