simias-svn Mailing List for simias (Page 5)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7529
          http://simias.svn.sourceforge.net/simias/?rev=7529&view=rev
Author:   hegdegg
Date:     2010-10-13 10:43:20 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
ID:#624816
Reviewer: Ramesh
Localization Required: No
Documentation Required: No
Description: Confirmation done before removing the slave server. After
slave server is removed, config file removed to ensure it cant get
restarted.

Modified Paths:
--------------
    trunk/src/core/Common/Configuration.cs
    trunk/src/server/setup/SimiasServerSetup.cs

Modified: trunk/src/core/Common/Configuration.cs
===================================================================

--- trunk/src/core/Common/Configuration.cs	2010-10-06 12:56:50 UTC (rev 7528)
+++ trunk/src/core/Common/Configuration.cs	2010-10-13 10:43:20 UTC (rev 7529)
@@ -48,6 +48,8 @@
 	{
 		#region Class Members
 		public const string DefaultConfigFileName = "Simias.config";
+		public const string RenamedConfigFileName = "Simiasconfig.removed";
+		
 
 		private const string SectionTag = "section";
 		private const string SettingTag = "setting";

Modified: trunk/src/server/setup/SimiasServerSetup.cs
===================================================================
--- trunk/src/server/setup/SimiasServerSetup.cs	2010-10-06 12:56:50 UTC (rev 7528)
+++ trunk/src/server/setup/SimiasServerSetup.cs	2010-10-13 10:43:20 UTC (rev 7529)
@@ -168,8 +168,11 @@
 		#endregion
 
 		#region Options
-
 		/// <summary>
+		/// Confirm slave server remove 
+		/// </summary>
+		public BoolOption confirmDelete = new BoolOption("confirm-delete", "Removing this server will make iFolders on this server unaccessible. Do you want to proceed", "Confirm slave server remove", false, true);
+		/// <summary>
 		/// The store path.
 		/// </summary>
 		public Option path = new Option("path,p", "Server's Data Path", "Path to the server's data files", true, "/var/simias/data");
@@ -381,7 +384,8 @@
 				// On windows we do not want to prompt for these values.
 				apache.Value = false;
 #endif
-
+			confirmDelete.Prompt = false;
+			confirmDelete.OnOptionEntered = new Option.OptionEnteredHandler( OnConfirmDelete );
 			path.OnOptionEntered = new Option.OptionEnteredHandler( OnPath );
 //			defaultConfigPath.OnOptionEntered = new Option.OptionEnteredHandler( OnDefaultConfig );
 
@@ -663,7 +667,16 @@
 			}
 			return true;
 		}
-
+         /// <summary>
+         /// Confirm slave server removal. 
+         /// </summary>
+         /// <returns>true if confirmed </returns>
+		private bool OnConfirmDelete()
+		{
+			if ( !confirmDelete.Value )
+				System.Environment.Exit( -1 );
+			return true;
+		}
         /// <summary>
         /// called during public URL selection
         /// </summary>
@@ -1464,7 +1477,7 @@
         /// <returns>true if fields of simias-server-setup set successfully</returns>
 		private bool OnRemove()
 		{
-			path.Prompt = systemAdminPassword.Prompt = true;
+			path.Prompt = systemAdminPassword.Prompt = confirmDelete.Prompt = true;
 			systemName.Prompt = systemDescription.Prompt = systemAdminDN.Prompt =  publicUrl.Prompt = slaveServer.Prompt =
 				useLdap.Prompt = ldapServer.Prompt = ldapPlugin.Prompt = secure.Prompt = ldapProxyDN.Prompt = ldapSearchContext.Prompt = 
 				namingAttribute.Prompt = privateUrl.Prompt = serverName.Prompt = useSsl.Prompt = 
@@ -2235,6 +2248,17 @@
 					Console.WriteLine("Failed to read \"Master server URL\" from \"{0}\"",configFile);
 					return false;
 				}
+				
+				try {
+					// rename config file so that if server is restarted it should not be coming up.
+					// FIXME: need a better way, may be we could have another option remove-with-data and clean up all
+					System.IO.File.Move(configFile, Path.Combine( storePath, Configuration.RenamedConfigFileName ) );
+				}
+				catch
+				{
+					Console.WriteLine("Unable to rename config file : {)}", configFile);
+				}
+
 				if(!UnRegisterSlaveFromMaster(systemAdminDN.Value,serverName.Value))
 				{
 					return false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2009	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (6)
2010	Jan	Feb (16)	Mar (9)	Apr (20)	May (24)	Jun (30)	Jul (29)	Aug (47)	Sep (11)	Oct (5)	Nov (3)	Dec (1)
2011	Jan (5)	Feb (2)	Mar (6)	Apr (15)	May (3)	Jun (2)	Jul (2)	Aug (5)	Sep (1)	Oct	Nov	Dec
2012	Jan	Feb	Mar (1)	Apr (5)	May (1)	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2013	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (6)	Sep (20)	Oct (5)	Nov	Dec
2014	Jan	Feb (3)	Mar (2)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr (1)	May (4)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec
2017	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec