Added a way to toggle sharing service logs on and off.

Misc fixes.

Author: Stephen Hodgson

Assets/HoloToolkit/Sharing/Scripts/SharingStage.cs

@@ -111,6 +111,9 @@ public class SharingStage : Singleton<SharingStage>
         private float pingIntervalCurrent;
         private bool isTryingToFindServer;
 
+        [Tooltip("Show Detailed Information for server connections")]
+        public bool ShowDetailedLogs;
+
         public string UserName
         {
             get
@@ -154,6 +157,7 @@ protected override void Awake()
 
             AppInstanceUniqueId = Guid.NewGuid().ToString();
             logWriter = new ConsoleLogWriter();
+            logWriter.ShowDetailedLogs = ShowDetailedLogs;
 
             if (AutoDiscoverServer)
             {
@@ -298,7 +302,10 @@ private void SendConnectedNotification()
 
         private void AutoDiscoverInit()
         {
-            Debug.Log("Looking for servers...");
+            if (ShowDetailedLogs)
+            {
+                Debug.Log("Looking for servers...");
+            }
             discoveryClientAdapter = new DiscoveryClientAdapter();
             discoveryClientAdapter.DiscoveredEvent += OnSystemDiscovered;
 
@@ -315,6 +322,10 @@ private void AutoDiscoverUpdate()
             pingIntervalCurrent += Time.deltaTime;
             if (pingIntervalCurrent > PingIntervalSec)
             {
+                if (ShowDetailedLogs)
+                {
+                    Debug.Log("Looking for servers...");
+                }
                 pingIntervalCurrent = 0;
                 discoveryClient.Ping();
             }
@@ -328,9 +339,15 @@ private void OnSystemDiscovered(DiscoveredSystem obj)
                 //Found a server. Stop pinging the network and connect 
                 isTryingToFindServer = false;
                 ServerAddress = obj.GetAddress();
-                Debug.Log("Server discovered at: " + ServerAddress);
+                if (ShowDetailedLogs)
+                {
+                    Debug.Log("Server discovered at: " + ServerAddress);
+                }
                 Connect();
-                Debug.LogFormat("Connected to: {0}:{1}", ServerAddress, ServerPort.ToString());
+                if (ShowDetailedLogs)
+                {
+                    Debug.LogFormat("Connected to: {0}:{1}", ServerAddress, ServerPort.ToString());
+                }
             }
         }
 
@@ -372,7 +389,10 @@ private void HandleLog(string logString, string stackTrace, LogType type)
 
                 case LogType.Log:
                 default:
-                    Log.Info(logString);
+                    if (ShowDetailedLogs)
+                    {
+                        Log.Info(logString);
+                    }
                     break;
             }
         }

Assets/HoloToolkit/Sharing/Scripts/Utilities/AutoJoinSession.cs

@@ -25,7 +25,8 @@ public class AutoJoinSession : MonoBehaviour
 
         private void Start()
         {
-            // Get the ServerSessionsTracker to use later.  Note that if this processes takes the role of a secondary client,
+            // Get the ServerSessionsTracker to use later.
+            // Note that if this processes takes the role of a secondary client,
             // then the sessionsTracker will always be null
             if (SharingStage.Instance != null && SharingStage.Instance.Manager != null)
             {
@@ -51,8 +52,11 @@ private void Update()
                     currentSession.GetName().GetString() != SessionName ||                       // We're in the wrong session
                     currentSession.GetMachineSessionState() == MachineSessionState.DISCONNECTED) // We aren't joined or joining the right session
                 {
-                    Debug.LogFormat("Session conn {0} Sessions: {1}.", sessionsTracker.IsServerConnected.ToString(), sessionsTracker.Sessions.Count.ToString());
-                    Debug.Log("Looking for " + SessionName);
+                    if (SharingStage.Instance.ShowDetailedLogs)
+                    {
+                        Debug.LogFormat("Session conn {0} Sessions: {1}.", sessionsTracker.IsServerConnected.ToString(), sessionsTracker.Sessions.Count.ToString());
+                        Debug.Log("Looking for " + SessionName);
+                    }
                     bool sessionFound = false;
 
                     for (int i = 0; i < sessionsTracker.Sessions.Count; ++i)
@@ -69,7 +73,11 @@ private void Update()
 
                     if (sessionsTracker.IsServerConnected && !sessionFound && !sessionCreationRequested)
                     {
-                        Debug.Log("Didn't find session, making a new one");
+                        if (SharingStage.Instance.ShowDetailedLogs)
+                        {
+                            Debug.Log("Didn't find session, making a new one");
+                        }
+
                         if (sessionsTracker.CreateSession(new XString(SessionName)))
                         {
                             sessionCreationRequested = true;

Assets/HoloToolkit/Sharing/Scripts/Utilities/ConsoleLogWriter.cs

@@ -10,19 +10,25 @@ namespace HoloToolkit.Sharing.Utilities
     /// </summary>
     public class ConsoleLogWriter : LogWriter
     {
+        public bool ShowDetailedLogs = false;
+
         public override void WriteLogEntry(LogSeverity severity, string message)
         {
-            if (severity == LogSeverity.Info)
-            {
-                Debug.Log(message);
-            }
-            else if (severity == LogSeverity.Warning)
-            {
-                Debug.LogWarning(message);
-            }
-            else
+            switch (severity)
             {
-                Debug.LogError(message);
+                case LogSeverity.Warning:
+                    Debug.LogWarning(message);
+                    break;
+                case LogSeverity.Error:
+                    Debug.LogError(message);
+                    break;
+                case LogSeverity.Info:
+                default:
+                    if (ShowDetailedLogs)
+                    {
+                        Debug.Log(message);
+                    }
+                    break;
             }
         }
     }

Assets/HoloToolkit/Sharing/Scripts/Utilities/DirectPairing.cs

@@ -80,7 +80,10 @@ private void OnDestroy()
 
         private void OnPairingConnectionSucceeded()
         {
-            Debug.Log("Direct Pairing Succeeded");
+            if (SharingStage.Instance.ShowDetailedLogs)
+            {
+                Debug.Log("Direct Pairing Succeeded");
+            }
         }
 
         private void OnPairingConnectionFailed(PairingResult result)
@@ -89,6 +92,7 @@ private void OnPairingConnectionFailed(PairingResult result)
 
             if (AutoReconnect)
             {
+                Debug.LogWarning("Attempting to reconnect...");
                 StartPairing();
             }
         }

Assets/HoloToolkit/Sharing/Tests/Scenes/SharingTest.unity

@@ -196,21 +196,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &611461194 stripped
-GameObject:
-  m_PrefabParentObject: {fileID: 163528, guid: 8aaf37823b26ee449bb3b3d7775965c3, type: 2}
-  m_PrefabInternal: {fileID: 1703234099}
---- !u!114 &611461195
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 611461194}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9236b45f60c55874b93c630faf4d45b9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &685058484
 GameObject:
   m_ObjectHideFlags: 0
@@ -303,6 +288,7 @@ GameObject:
   - component: {fileID: 942915102}
   - component: {fileID: 942915101}
   - component: {fileID: 942915103}
+  - component: {fileID: 942915104}
   m_Layer: 0
   m_Name: HologramCollection
   m_TagString: Untagged
@@ -359,6 +345,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c7a63ef1b98adec49bdb80fe1f187893, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &942915104
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 942915099}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9236b45f60c55874b93c630faf4d45b9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &1703234099
 Prefab:
   m_ObjectHideFlags: 0
@@ -398,7 +395,11 @@ Prefab:
       propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 0}
+    - target: {fileID: 114000012667812730, guid: 8aaf37823b26ee449bb3b3d7775965c3,
+        type: 2}
+      propertyPath: ShowDetailedLogs
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 8aaf37823b26ee449bb3b3d7775965c3, type: 2}
   m_IsPrefabParent: 0