Merge

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs

@@ -1492,7 +1492,6 @@ namespace WebsitePanel.EnterpriseServer
 
         private static bool AccountExists(string accountName, int ServiceId)
         {
-
             if (!DataProvider.ExchangeAccountExists(accountName))
             {
                 Organizations orgProxy = GetOrganizationProxy(ServiceId);
@@ -1503,6 +1502,7 @@ namespace WebsitePanel.EnterpriseServer
             else
                 return true;
 
+
         }
 
         public static int DeleteUser(int itemId, int accountId)

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/Scheduler.cs

@@ -40,9 +40,9 @@ namespace WebsitePanel.EnterpriseServer
 
     public sealed class Scheduler
     {
-        static SchedulerJob nextSchedule = null;
+        public static SchedulerJob nextSchedule = null;
 
-        // main timer
+        // main timer and put it to sleep
         static Timer scheduleTimer = new Timer(new TimerCallback(RunNextSchedule),
                                             null,
                                             Timeout.Infinite,
@@ -92,6 +92,8 @@ namespace WebsitePanel.EnterpriseServer
                     // this will put the timer to sleep
                     scheduleTimer.Change(Timeout.Infinite, Timeout.Infinite);
 
+                    System.Threading.Thread.Sleep(1000);
+
                     // run immediately
                     RunNextSchedule(null);
                 }
@@ -121,6 +123,10 @@ namespace WebsitePanel.EnterpriseServer
         }
 
         static void RunSchedule(SchedulerJob schedule, bool changeNextRun)
+        {
+
+
+            try
             {
                 // update next run (if required)
                 if (changeNextRun)
@@ -142,11 +148,23 @@ namespace WebsitePanel.EnterpriseServer
                 SchedulerController.UpdateSchedule(schedule.ScheduleInfo);
 
                 // skip execution if the current task is still running
-            if (scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
-                return;
-
+                scheduledTasks = TaskManager.GetScheduledTasks();
+                if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
+                {
                     // run the schedule in the separate thread
                     schedule.Run();
                 }
             }
+            catch (Exception Ex)
+            {
+                try
+                {
+                    TaskManager.WriteError(string.Format("RunSchedule Error : {0}", Ex.Message));
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
+    }
 }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/SchedulerController.cs

@@ -199,7 +199,7 @@ namespace WebsitePanel.EnterpriseServer
                     nextStart = lastRun.AddSeconds(schedule.Interval);
                 }
 
-                if(nextStart < now)
+                if (nextStart < now)
                     nextStart = now; // run immediately
 
                 // check if start time is in allowed interval
@@ -261,7 +261,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // check quota
-            if(PackageController.GetPackageQuota(schedule.PackageId, Quotas.OS_SCHEDULEDTASKS).QuotaExhausted)
+            if (PackageController.GetPackageQuota(schedule.PackageId, Quotas.OS_SCHEDULEDTASKS).QuotaExhausted)
                 return BusinessErrorCodes.ERROR_OS_SCHEDULED_TASK_QUOTA_LIMIT;
 
             CalculateNextStartTime(schedule);

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/SchedulerJob.cs

@@ -119,8 +119,14 @@ namespace WebsitePanel.EnterpriseServer
             finally
             {
                 // complete task
+                try
+                {
                     TaskManager.CompleteTask();
                 }
+                catch (Exception)
+                {
+                }
+            }
         }
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs

@@ -754,6 +754,49 @@ namespace WebsitePanel.Providers.HostedSolution
 
 
 
+        public bool DoesSamAccountNameExist(string accountName)
+        {
+            return DoesSamAccountNameExistInternal(accountName);
+        }
+
+
+        private bool DoesSamAccountNameExistInternal(string accountName)
+        {
+            HostedSolutionLog.LogStart("DoesSamAccountNameExistInternal");
+            HostedSolutionLog.DebugInfo("sAMAccountName : {0}", accountName);
+            bool bFound = false;
+
+            try
+            {
+
+                string path = GetRootOU();
+                HostedSolutionLog.DebugInfo("Search path : {0}", path);
+                DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(path);
+
+                DirectorySearcher searcher = new DirectorySearcher(entry);
+                searcher.PropertiesToLoad.Add("sAMAccountName");
+                searcher.Filter = "(sAMAccountName=" + accountName + ")";
+                searcher.SearchScope = SearchScope.Subtree;
+
+                SearchResult resCollection = searcher.FindOne();
+                if (resCollection != null)
+                {
+                    if (resCollection.Properties["samaccountname"] != null)
+                        bFound = true;
+                }
+            }
+            catch (Exception e)
+            {
+                HostedSolutionLog.DebugInfo("Failed : {0}", e.Message);
+            }
+
+            HostedSolutionLog.DebugInfo("DoesSamAccountNameExistInternal Result: {0}", bFound);
+            HostedSolutionLog.LogEnd("DoesSamAccountNameExistInternal");
+
+            return bFound;
+        }
+
+
         #endregion
 
         #region Domains

WebsitePanel/build.xml

@@ -3,7 +3,7 @@
 		<Version>2.1.0</Version>
 		<FileVersion>$(BUILD_NUMBER)</FileVersion>
 		<VersionLabel>$(BUILD_NUMBER)</VersionLabel>
-		<ReleaseDate>2012-01-22</ReleaseDate>
+		<ReleaseDate>2012-01-25</ReleaseDate>
 		<BuildConfiguration></BuildConfiguration>
 		<RootFolder>..</RootFolder>
 		<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>