xibosignage · dasgarner · Feb 28, 2015 · Jan 26, 2015 · Jan 28, 2015 · Jan 28, 2015
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+# Contributing
+We'd love to work with you and accept your contributions. For small changes like bug fixes, typos, etc. Please Fork us and submit a pull request with the details of what you have changed.
+
+For larger changes, you will have to electronically sign a statement that indicates two things:
+
+* You are willingly licensing your contributions under the terms of the open source license of the project that you're contributing to.
+
+* You are legally able to license your contributions as stated.
+
+This is called a Contributor Licence Agreement or "CLA" for short.
+
+The standard licence for Xibo is the [AGPLv3](LICENSE). For more information please see [CONTRIBUTING](https://github.com/xibosignage/xibo/blob/master/CONTRIBUTING.md).
diff --git a/Control/Region.cs b/Control/Region.cs
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-2014 Daniel Garner
+ * Copyright (C) 2006-2015 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -38,8 +38,8 @@ class Region : Panel
 
         private Media _media;
         private RegionOptions _options;
-        public bool _hasExpired = false;
-        public bool _layoutExpired = false;
+        private bool _hasExpired = false;
+        private bool _layoutExpired = false;
         private int _currentSequence = -1;
 
         // Stat objects
@@ -101,6 +101,23 @@ public RegionOptions regionOptions
             }
         }
 
+        /// <summary>
+        /// Inform the region that the layout has expired
+        /// </summary>
+        public void setLayoutExpired()
+        {
+            _layoutExpired = true;
+        }
+
+        /// <summary>
+        /// Has this region expired
+        /// </summary>
+        /// <returns></returns>
+        public bool hasExpired()
+        {
+            return _hasExpired;
+        }
+
         ///<summary>
         /// Evaulates the change in options
         ///</summary>
@@ -343,6 +360,9 @@ private void ParseOptionsForMediaNode(XmlNode mediaNode, XmlAttributeCollection
             // There will be some stuff on option nodes
             XmlNode optionNode = mediaNode.FirstChild;
 
+            // Track if an update interval has been provided in the XLF
+            bool updateIntervalProvided = false;
+
             // Loop through each option node
             foreach (XmlNode option in optionNode.ChildNodes)
             {
@@ -371,6 +391,8 @@ private void ParseOptionsForMediaNode(XmlNode mediaNode, XmlAttributeCollection
                 }
                 else if (option.Name == "updateInterval")
                 {
+                    updateIntervalProvided = true;
+
                     try
                     {
                         _options.updateInterval = int.Parse(option.InnerText);
@@ -410,6 +432,10 @@ private void ParseOptionsForMediaNode(XmlNode mediaNode, XmlAttributeCollection
                     _options.javaScript = raw.InnerText;
                 }
             }
+
+            // Media Types without an update interval should be set to something rather high
+            if (!updateIntervalProvided)
+                _options.updateInterval = int.MaxValue;
         }
 
         /// <summary>
@@ -508,10 +534,9 @@ private Media CreateNextMediaNode(RegionOptions options)
         /// <param name="media"></param>
         private void StartMedia(Media media)
         {
-            media.RenderMedia();
-
             Trace.WriteLine(new LogMessage("Region - StartMedia", "Starting media"), LogType.Audit.ToString());
 
+            media.RenderMedia();
             Controls.Add(media);
         }
 
@@ -536,8 +561,7 @@ private void StopMedia(Media media)
             }
             catch (Exception ex)
             {
-                Debug.WriteLine("No media to remove");
-                Debug.WriteLine(ex.Message);
+                Trace.WriteLine(new LogMessage("Region - Stop Media", "Unable to dispose. Ex = " + ex.Message), LogType.Audit.ToString());
             }
         }
 
@@ -585,6 +609,10 @@ private void media_DurationElapsedEvent(int filesPlayed)
                 // Increment the _current sequence by the number of filesPlayed (minus 1)
                 _currentSequence = _currentSequence + (filesPlayed - 1);
 
+            // If this layout has been expired we know that everything will soon be torn down, so do nothing
+            if (_layoutExpired)
+                return;
+
             // make some decisions about what to do next
             try
             {
@@ -641,8 +669,7 @@ protected override void Dispose(bool disposing)
                 }
                 catch (Exception ex)
                 {
-                    Debug.WriteLine(ex.Message);
-                    Debug.WriteLine("There was no media to dispose", "Region - Dispose");
+                    Trace.WriteLine(new LogMessage("Region - Dispose", "Unable to dispose media. Ex = " + ex.Message), LogType.Audit.ToString());
                 }
                 finally
                 {

diff --git a/Log/ClientInfo.cs b/Log/ClientInfo.cs
@@ -162,6 +162,10 @@ public void AddToLogGrid(string message, LogType logType)
                 return;
             }
 
+            // Prevent the log grid getting too large (clear at 500 messages)
+            if (logDataGridView.RowCount > 500)
+                logDataGridView.Rows.Clear();
+
             int newRow = logDataGridView.Rows.Add();
 
             LogMessage logMessage;

diff --git a/Log/LogMessage.cs b/Log/LogMessage.cs
@@ -97,10 +97,10 @@ public override string ToString()
             // Just do this with a string builder rather than an XML builder.
             String theMessage;
 
-            theMessage = String.Format("<message>{0}</message>", SecurityElement.Escape(_message));
-            theMessage += String.Format("<method>{0}</method>", _method);
-            theMessage += String.Format("<logdate>{0}</logdate>", LogDate);
+            theMessage = String.Format("<logdate>{0}</logdate>", LogDate);
             theMessage += String.Format("<thread>{0}</thread>", _thread);
+            theMessage += String.Format("<method>{0}</method>", _method);
+            theMessage += String.Format("<message>{0}</message>", SecurityElement.Escape(_message));
 
             if (_scheduleId != 0) theMessage += String.Format("<scheduleid>{0}</scheduleid>", _scheduleId.ToString());
             if (_layoutId != 0) theMessage += String.Format("<layoutid>{0}</layoutid>", _scheduleId.ToString());

diff --git a/Log/StatLog.cs b/Log/StatLog.cs
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2009-2014 Spring Signage Ltd
+ * Copyright (C) 2009-2015 Spring Signage Ltd
  *
  * This file is part of Xibo.
  *
@@ -32,6 +32,7 @@ namespace XiboClient
 {
     class StatLog
     {
+        public static object _locker = new object();
         private Collection<Stat> _stats;
         private HardwareKey _hardwareKey;
 
@@ -194,58 +195,73 @@ private void FlushToFile()
         /// </summary>
         private void ProcessQueueToXmds()
         {
-            Debug.WriteLine(new LogMessage("FlushToXmds", String.Format("IN")), LogType.Audit.ToString());
-
-            // If we haven't had a successful connection recently, then don't log
-            if (ApplicationSettings.Default.XmdsLastConnection.AddSeconds((int)ApplicationSettings.Default.CollectInterval) < DateTime.Now)
-                return;
-
-            // Get a list of all the log files waiting to be sent to XMDS.
-            string[] logFiles = Directory.GetFiles(ApplicationSettings.Default.LibraryPath, "*" + ApplicationSettings.Default.StatsLogFile + "*");
-
-            foreach (string fileName in logFiles)
+            try
             {
-                // If we have some, create an XMDS object
-                using (xmds.xmds logtoXmds = new xmds.xmds())
-                {
-                    logtoXmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
-
-                    // construct the log message
-                    StringBuilder builder = new StringBuilder();
-                    builder.Append("<log>");
-
-                    foreach (string entry in File.ReadAllLines(fileName))
-                        builder.Append(entry);
-
-                    builder.Append("</log>");
+                // If we haven't had a successful connection recently, then don't log
+                if (ApplicationSettings.Default.XmdsLastConnection.AddSeconds((int)ApplicationSettings.Default.CollectInterval) < DateTime.Now)
+                    return;
 
-                    try
-                    {
-                        logtoXmds.SubmitStats(ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
-
-                        // Delete the file we are on
-                        File.Delete(fileName);
-                    }
-                    catch (WebException webEx)
-                    {
-                        // Increment the quantity of XMDS failures and bail out
-                        ApplicationSettings.Default.IncrementXmdsErrorCount();
+                lock (_locker)
+                {
+                    // Get a list of all the log files waiting to be sent to XMDS.
+                    string[] logFiles = Directory.GetFiles(ApplicationSettings.Default.LibraryPath, "*" + ApplicationSettings.Default.StatsLogFile + "*");
 
-                        // Log this message, but dont abort the thread
-                        Trace.WriteLine(new LogMessage("ProcessQueueToXmds", "WebException: " + webEx.Message), LogType.Error.ToString());
+                    // Track processed files
+                    int filesProcessed = 0;
 
-                        // Drop out the loop
-                        break;
-                    }
-                    catch (Exception e)
+                    // Loop through each file
+                    foreach (string fileName in logFiles)
                     {
-                        Trace.WriteLine(new LogMessage("FlushToXmds", string.Format("Exception when submitting to XMDS: {0}", e.Message)), LogType.Error.ToString());
+                        // Only process as many files in one go as configured
+                        if (filesProcessed >= ApplicationSettings.Default.MaxLogFileUploads)
+                            break;
+
+                        // If we have some, create an XMDS object
+                        using (xmds.xmds logtoXmds = new xmds.xmds())
+                        {
+                            logtoXmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
+
+                            // construct the log message
+                            StringBuilder builder = new StringBuilder();
+                            builder.Append("<log>");
+
+                            foreach (string entry in File.ReadAllLines(fileName))
+                                builder.Append(entry);
+
+                            builder.Append("</log>");
+
+                            try
+                            {
+                                logtoXmds.SubmitStats(ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
+
+                                // Delete the file we are on
+                                File.Delete(fileName);
+                            }
+                            catch (WebException webEx)
+                            {
+                                // Increment the quantity of XMDS failures and bail out
+                                ApplicationSettings.Default.IncrementXmdsErrorCount();
+
+                                // Log this message, but dont abort the thread
+                                Trace.WriteLine(new LogMessage("ProcessQueueToXmds", "WebException: " + webEx.Message), LogType.Error.ToString());
+
+                                // Drop out the loop
+                                break;
+                            }
+                            catch (Exception e)
+                            {
+                                Trace.WriteLine(new LogMessage("FlushToXmds", string.Format("Exception when submitting to XMDS: {0}", e.Message)), LogType.Error.ToString());
+                            }
+
+                            filesProcessed++;
+                        }
                     }
                 }
             }
-
-            // Log out
-            Debug.WriteLine(new LogMessage("FlushToXmds", String.Format("OUT")), LogType.Audit.ToString());
+            catch (Exception e)
+            {
+                Trace.WriteLine(new LogMessage("FlushToXmds", string.Format("Unknown Exception: {0}", e.Message)), LogType.Error.ToString());
+            }
         }
     }