Changeset 901

User picture

Author: Eric Maupin

(2010/03/23 07:31) About 2 years ago

 * Fixed #179 (Missing password attribute for server configuration)

Affected files

Updated releases/0.12/src/Server/Barrel/Barrel.cs Download diff

900901
81
81



82
				log.Info ("Setting up");
82
				log.Info ("Setting up");



83
83



84
				ServerSettings settings = new ServerSettings



85
				{



86
					Name = serverConfig.Name,



87
					Description = serverConfig.Description,



88
					ServerPassword = serverConfig.Password,



89
				};



90



84
				GablarskiServer server;
91
				GablarskiServer server;



85
				if (providers.Backend != null)
92
				if (providers.Backend != null)



86
					server = new GablarskiServer (new ServerSettings(), providers.Backend);
93
					server = new GablarskiServer (settings, providers.Backend);



87
				else
94
				else



88
					server = new GablarskiServer (new ServerSettings(), providers.Authentication, providers.Permissions, providers.Channels);
95
					server = new GablarskiServer (settings, providers.Authentication, providers.Permissions, providers.Channels);



89
96



90
				server.AddConnectionProvider (new NetworkServerConnectionProvider { Port = serverConfig.Port });
97
				server.AddConnectionProvider (new NetworkServerConnectionProvider { Port = serverConfig.Port });



91
98





          

  Updated
releases/0.12/src/Server/Barrel/Config/ServerElement.cs  Download diff




      
      
900901
60
			set { this["description"] = value; }
60
			set { this["description"] = value; }



61
		}
61
		}



62
62



63
		[ConfigurationProperty ("password", IsRequired = false)]



64
		public string Password



65
		{



66
			get { return (string) this["password"]; }



67
			set { this["password"] = value; }



68
		}



69



63
		[ConfigurationProperty ("port", DefaultValue = 0)]
70
		[ConfigurationProperty ("port", DefaultValue = 0)]



64
		public int Port
71
		public int Port



65
		{
72
		{





          

  Updated
trunk/src/Server/Barrel/Barrel.cs  Download diff




      
      
900901
81
81



82
				log.Info ("Setting up");
82
				log.Info ("Setting up");



83
83



84
				GablarskiServer server = new GablarskiServer (new ServerSettings(), providers.Users, providers.Permissions, providers.Channels);
84
				GablarskiServer server = new GablarskiServer (new ServerSettings



85
				{



86
					Name = serverConfig.Name,



87
					Description = serverConfig.Description,



88
					ServerPassword = serverConfig.Password,



89
				}, providers.Users, providers.Permissions, providers.Channels);



85
				server.AddConnectionProvider (new NetworkServerConnectionProvider { Port = serverConfig.Port });
90
				server.AddConnectionProvider (new NetworkServerConnectionProvider { Port = serverConfig.Port });



86
91



87
				foreach (IConnectionProvider provider in providers.ConnectionProviders)
92
				foreach (IConnectionProvider provider in providers.ConnectionProviders)





          

  Updated
trunk/src/Server/Barrel/Config/ServerElement.cs  Download diff




      
      
900901
60
			set { this["description"] = value; }
60
			set { this["description"] = value; }



61
		}
61
		}



62
62



63
		[ConfigurationProperty ("password", IsRequired = false)]



64
		public string Password



65
		{



66
			get { return (string) this["password"]; }



67
			set { this["password"] = value; }



68
		}



69



63
		[ConfigurationProperty ("port", DefaultValue = 0)]
70
		[ConfigurationProperty ("port", DefaultValue = 0)]



64
		public int Port
71
		public int Port



65
		{
72
		{