From 0cdbb36bc5c3dfc80d0ce6497ef595452bb6e8a7 Mon Sep 17 00:00:00 2001 From: Carsten Date: Sat, 16 Apr 2016 19:47:13 +0200 Subject: [PATCH] Localized texts --- .../InitializationMessage.cs | 56 ++++++++++++++++ .../Ntp.Analyzer.Localize.csproj | 1 + Ntp.Analyzer.Process/Initializer.cs | 64 +++++++++++-------- 3 files changed, 94 insertions(+), 27 deletions(-) create mode 100644 Ntp.Analyzer.Localize/InitializationMessage.cs diff --git a/Ntp.Analyzer.Localize/InitializationMessage.cs b/Ntp.Analyzer.Localize/InitializationMessage.cs new file mode 100644 index 00000000..c7bd7f96 --- /dev/null +++ b/Ntp.Analyzer.Localize/InitializationMessage.cs @@ -0,0 +1,56 @@ +// +// InitializationMessage.cs +// +// Author: +// Carsten Sonne Larsen +// +// Copyright (c) 2016 Carsten Sonne Larsen +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +namespace Ntp.Analyzer.Localize +{ + public static class InitializationMessage + { + public const string Welcome = "NTP Analyzer {0} started."; + public const string UsingConfig = "Using configuration {0}"; + public const string UsingPid = "Running with pid {0}"; + public const string UsingName = "Instance named {0}"; + public const string UsingUserId = "Running under user id {0}"; + + public const string JobInitStart = "Initializing jobs."; + public const string JobInitEnd = "All jobs initialized."; + public const string ListenerReady = "Listening on {0}"; + public const string ListenerError = "Error during initialization of listerners."; + public const string ClusterReady = "Reqesting to cluster {0}"; + public const string ClusterError = "Error during initialization of cluster node."; + public const string NewHost = "Created a new host in database ID {0} with name {1} and IP {2}."; + public const string NewPeer = "Created a new peer in database with name {0} and IP {1}."; + + public const string DatabaseError = "Error during initialization of database."; + public const string TableError = "Could not populate tables with data."; + public const string SchedulerError = "Error during initialization of scheduler."; + public const string UserIdError = "Failed to set user id {0}"; + public const string NoConfig = "Cannot find configuration file {0}"; + public const string ConfigError = "Cannot read configuration file {0}"; + public const string ConfigParseError = "Errors in configuration file:"; + public const string LogFileError = "Cannot create log file. {0}"; + public const string PidFileError = "Cannot create pid file. {0}"; + } +} \ No newline at end of file diff --git a/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj b/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj index 10fcf2a6..2ab90845 100644 --- a/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj +++ b/Ntp.Analyzer.Localize/Ntp.Analyzer.Localize.csproj @@ -46,6 +46,7 @@ + \ No newline at end of file diff --git a/Ntp.Analyzer.Process/Initializer.cs b/Ntp.Analyzer.Process/Initializer.cs index 9991851b..3cb1847a 100644 --- a/Ntp.Analyzer.Process/Initializer.cs +++ b/Ntp.Analyzer.Process/Initializer.cs @@ -36,17 +36,17 @@ using Ntp.Analyzer.Config.Graph; using Ntp.Analyzer.Config.Page; using Ntp.Analyzer.Config.Root; using Ntp.Analyzer.Data; +using Ntp.Analyzer.Export; using Ntp.Analyzer.Localize; using Ntp.Analyzer.Log; using Ntp.Analyzer.Objects; using Ntp.Analyzer.Objects.Live; +using Ntp.Analyzer.Process.Description; using Ntp.Config; using Ntp.Interop; using Ntp.Monitor.Client; using Ntp.Monitor.Server; using Ntp.Process; -using Ntp.Analyzer.Process.Description; -using Ntp.Analyzer.Export; namespace Ntp.Analyzer.Process { @@ -139,8 +139,9 @@ namespace Ntp.Analyzer.Process private bool InitializeConfiguration () { if (!File.Exists (configFile)) { - Console.WriteLine ("Cannot find configuration file: " + configFile); + Console.WriteLine (String.Format (InitializationMessage.NoConfig, configFile)); return false; + } // Read config. @@ -149,13 +150,13 @@ namespace Ntp.Analyzer.Process ConfigurationBlock block = new ConfigurationBlock (configLines); config = Configuration.Create (block); } catch (Exception ex) { - Console.WriteLine ("Cannot read configuration file: " + configFile); + Console.WriteLine (String.Format (InitializationMessage.ConfigError, configFile)); Console.WriteLine (ex.Message); return false; } if (ConfigurationBase.Errors != String.Empty) { - Console.WriteLine ("Errors in configuration file"); + Console.WriteLine (InitializationMessage.ConfigParseError); Console.WriteLine (ConfigurationBase.Errors); return false; } @@ -173,21 +174,29 @@ namespace Ntp.Analyzer.Process log = LogFactory.CreateLog (config.Log); log.Initialize (); } catch (Exception ex) { - Console.WriteLine ("Cannot create log file. " + ex.Message); + Console.WriteLine (String.Format (InitializationMessage.LogFileError, ex.Message)); return false; } // Initialize log. - if (firstrun) - log.WriteLine ("NTP Analyzer " + version + " started.", Severity.Notice); - log.WriteLine ("Using configuration " + configFile, Severity.Notice); - log.WriteLine ("Running with pid " + pid, Severity.Notice); - log.WriteLine ("Instance named " + name, Severity.Notice); + if (firstrun) { + log.WriteLine (String.Format ( + InitializationMessage.Welcome, version), Severity.Notice); + } + + log.WriteLine (String.Format ( + InitializationMessage.UsingConfig, configFile), Severity.Notice); + + log.WriteLine (String.Format ( + InitializationMessage.UsingPid, pid), Severity.Notice); + + log.WriteLine (String.Format ( + InitializationMessage.UsingName, name), Severity.Notice); if (config.Permission.AppUserId != null && config.Permission.AppUserId.HasValue) { if (Permission.SetUserId (config.Permission.AppUserId.Value)) { log.WriteLine (String.Format ( - "Running under user id {0}", config.Permission.AppUserId.Value), + InitializationMessage.UsingUserId, config.Permission.AppUserId.Value), Severity.Notice); } } @@ -204,7 +213,7 @@ namespace Ntp.Analyzer.Process if (config.Permission != null && config.Permission.AppUserId.HasValue) { if (!Permission.SetUserId (config.Permission.AppUserId.Value)) { Console.WriteLine (String.Format ( - "Failed to set user id {0}", config.Permission.AppUserId.Value)); + InitializationMessage.UserIdError, config.Permission.AppUserId.Value)); return false; } } @@ -214,7 +223,8 @@ namespace Ntp.Analyzer.Process try { File.WriteAllText (pidFile, pid.ToString ()); } catch (Exception e) { - Console.WriteLine ("Failed to write pid file: " + e.Message); + Console.WriteLine (String.Format ( + InitializationMessage.PidFileError, e.Message)); return false; } } @@ -261,7 +271,7 @@ namespace Ntp.Analyzer.Process DataInitializer initializer = new DataInitializer (log); initializer.CreateDatabase (); } catch (Exception e) { - log.WriteLine ("Error during initialization of database.", Severity.Error); + log.WriteLine (InitializationMessage.DatabaseError, Severity.Error); log.WriteLine (e.Message, Severity.Debug); log.WriteLine (e, Severity.Trace); } @@ -287,8 +297,7 @@ namespace Ntp.Analyzer.Process host = new Host (server.HostId, server.ServerName, ip.ToString (), null); DataFace.Instance.Hosts.Save (host); Log.WriteLine (String.Format ( - "Created a new host in database ID {0} with name {1} and IP {2}.", - server.HostId, server.ServerName, ip), + InitializationMessage.NewHost, server.HostId, server.ServerName, ip), Severity.Info); } @@ -299,14 +308,13 @@ namespace Ntp.Analyzer.Process Peer peer = new Peer (entry.Remote, entry.Remote, null); DataFace.Instance.Peers.Save (peer); Log.WriteLine (String.Format ( - "Created a new peer in database with name {0} and IP {1}.", - entry.Remote, entry.Remote), + InitializationMessage.NewPeer, entry.Remote, entry.Remote), Severity.Info); } } } } catch (Exception e) { - log.WriteLine ("Could not populate tables with data.", Severity.Error); + log.WriteLine (InitializationMessage.TableError, Severity.Error); log.WriteLine (e.Message, Severity.Debug); log.WriteLine (e, Severity.Trace); } @@ -323,10 +331,11 @@ namespace Ntp.Analyzer.Process listener.Open (); listeners.Add (listener); - log.WriteLine ("Listening " + listener, Severity.Notice); + log.WriteLine (String.Format ( + InitializationMessage.ListenerError, listener), Severity.Notice); } } catch (Exception e) { - log.WriteLine ("Error during initialization of listerners.", Severity.Error); + log.WriteLine (InitializationMessage.ListenerError, Severity.Error); log.WriteLine (e.Message, Severity.Debug); log.WriteLine (e, Severity.Trace); } @@ -347,10 +356,11 @@ namespace Ntp.Analyzer.Process IRequest req = new TextRequest (ip, node.Port); nodes.Add (req); - log.WriteLine ("Reqesting to cluster " + node.Address, Severity.Notice); + log.WriteLine (String.Format ( + InitializationMessage.ClusterReady, node.Address), Severity.Notice); } } catch (Exception e) { - log.WriteLine ("Error during initialization of cluster node.", Severity.Error); + log.WriteLine (InitializationMessage.ClusterError, Severity.Error); log.WriteLine (e.Message, Severity.Debug); log.WriteLine (e, Severity.Trace); } @@ -365,7 +375,7 @@ namespace Ntp.Analyzer.Process try { scheduler = new Scheduler (log); - log.WriteLine ("Initializing jobs.", Severity.Debug); + log.WriteLine (InitializationMessage.JobInitStart, Severity.Debug); scheduler.Add (new BulkStatJob (config.Bulk, scheduler.Log)); // Add jobs to schedule. @@ -404,10 +414,10 @@ namespace Ntp.Analyzer.Process adminJob.SetJobList (scheduler); // Done - log.WriteLine ("All jobs initialized.", Severity.Debug); + log.WriteLine (InitializationMessage.JobInitEnd, Severity.Debug); } } catch (Exception e) { - log.WriteLine ("Error during initialization of scheduler.", Severity.Error); + log.WriteLine (InitializationMessage.SchedulerError, Severity.Error); log.WriteLine (e.Message, Severity.Debug); log.WriteLine (e, Severity.Trace); }