Merge pull request #782 from mantidproject/11820_log_networkproxy

Fix NetworkProxy log messages
mantidproject · May 22, 2015 · 4793b51 · 4793b51
2 parents 70c3507 + 099b5b0
commit 4793b51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/Kernel/src/NetworkProxyOSX.cpp b/Code/Mantid/Framework/Kernel/src/NetworkProxyOSX.cpp
@@ -210,7 +210,7 @@ ProxyInfo findHttpProxy(const std::string &targetURLString,
   ProxyInfo httpProxy;
   CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL);
   if (!dict) {
-    logger.debug("ScriptRepository SCDynamicStoreCopyProxies returned NULL");
+    logger.debug("NetworkProxyOSX SCDynamicStoreCopyProxies returned NULL");
   }
 
   // Query the proxy pac first.
@@ -235,7 +235,7 @@ ProxyInfo findHttpProxy(const std::string &targetURLString,
   }
 
   if (!foundHttpProxy) {
-    logger.debug("ScriptRepositry. No system HTTP Proxy set!");
+    logger.debug("NetworkProxyOSX. No system HTTP Proxy set!");
   }
 
   return httpProxy;

diff --git a/Code/Mantid/Framework/Kernel/src/NetworkProxyWin.cpp b/Code/Mantid/Framework/Kernel/src/NetworkProxyWin.cpp
@@ -32,7 +32,7 @@ bool get_proxy_configuration_win(const std::string &target_url,
   // the loop is just to allow us to go out of this session whenever we want
   while (true) {
     // Use WinHttpOpen to obtain a session handle.
-    hSession = WinHttpOpen(L"ScriptRepository FindingProxy/1.0",
+    hSession = WinHttpOpen(L"NetworkProxyWin FindingProxy/1.0",
                            WINHTTP_ACCESS_TYPE_DEFAULT_PROXY,
                            WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0);
     if (!hSession) {
@@ -162,7 +162,7 @@ ProxyInfo NetworkProxy::getHttpProxy(const std::string &targetURLString) {
     }
     proxyInfo = ProxyInfo(proxyServer, proxyPort, true);
   } else {
-    m_logger.information() << "ScriptRepository failed to find the proxy "
+    m_logger.information() << "NetworkProxyWin failed to find the proxy "
                               "information. It will attempt without proxy. "
                            << errmsg << std::endl;
   }