From 3d98f1b3eebc605cc2bcbed823e3c172a573e208 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 1 Jun 2017 13:46:37 -0700
Subject: [PATCH 1/3] print metaverse session ID to debug log

---
 libraries/networking/src/AccountManager.cpp | 7 +++++++
 libraries/networking/src/AccountManager.h   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 6266ad0f89..85232f9f61 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -201,6 +201,13 @@ void AccountManager::setAuthURL(const QUrl& authURL) {
     }
 }
 
+void AccountManager::setSessionID(const QUuid& sessionID) {
+    if (_sessionID != sessionID) {
+        qCDebug(networking) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(sessionID);
+        _sessionID = sessionID;
+    }
+}
+
 void AccountManager::sendRequest(const QString& path,
                                  AccountManagerAuth::Type authType,
                                  QNetworkAccessManager::Operation operation,
diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h
index dd2216957f..9a456ca7e8 100644
--- a/libraries/networking/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@@ -90,7 +90,7 @@ public:
     static QJsonObject dataObjectFromResponse(QNetworkReply& requestReply);
 
     QUuid getSessionID() const { return _sessionID; }
-    void setSessionID(const QUuid& sessionID) { _sessionID = sessionID; }
+    void setSessionID(const QUuid& sessionID);
 
     void setTemporaryDomain(const QUuid& domainID, const QString& key);
     const QString& getTemporaryDomainKey(const QUuid& domainID) { return _accountInfo.getTemporaryDomainKey(domainID); }

From 06b3ecfdc3072a5a90dab3e21ae1915f3d2bddfc Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 1 Jun 2017 15:50:56 -0700
Subject: [PATCH 2/3] also log metaverse session ID during ctor of
 AccountManager

---
 libraries/networking/src/AccountManager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 85232f9f61..ab336b0b31 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -90,6 +90,8 @@ AccountManager::AccountManager(UserAgentGetter userAgentGetter) :
     qRegisterMetaType<QHttpMultiPart*>("QHttpMultiPart*");
 
     qRegisterMetaType<AccountManagerAuth::Type>();
+
+    qCDebug(networking) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(_sessionID);
 }
 
 const QString DOUBLE_SLASH_SUBSTITUTE = "slashslash";
@@ -203,7 +205,7 @@ void AccountManager::setAuthURL(const QUrl& authURL) {
 
 void AccountManager::setSessionID(const QUuid& sessionID) {
     if (_sessionID != sessionID) {
-        qCDebug(networking) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(sessionID);
+        qCDebug(networking) << "Metaverse session ID changed to" << uuidStringWithoutCurlyBraces(sessionID);
         _sessionID = sessionID;
     }
 }

From 0f22b07026be8558ba18041f8d545bf77f6f80b2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 1 Jun 2017 16:07:36 -0700
Subject: [PATCH 3/3] move session ID logging later in app startup

---
 interface/src/Application.cpp               | 2 ++
 libraries/networking/src/AccountManager.cpp | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 46c4c0bd4e..8c6bea0905 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1459,6 +1459,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     updateSystemTabletMode();
 
     connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged);
+
+    qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
 }
 
 void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) {
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index ab336b0b31..c6fffbfdbd 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -90,8 +90,6 @@ AccountManager::AccountManager(UserAgentGetter userAgentGetter) :
     qRegisterMetaType<QHttpMultiPart*>("QHttpMultiPart*");
 
     qRegisterMetaType<AccountManagerAuth::Type>();
-
-    qCDebug(networking) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(_sessionID);
 }
 
 const QString DOUBLE_SLASH_SUBSTITUTE = "slashslash";