diff options
Diffstat (limited to 'csharp/test/Ice/metrics/Server.cs')
| -rw-r--r-- | csharp/test/Ice/metrics/Server.cs | 74 |
1 files changed, 24 insertions, 50 deletions
diff --git a/csharp/test/Ice/metrics/Server.cs b/csharp/test/Ice/metrics/Server.cs index d926a8d2dba..0c444307afb 100644 --- a/csharp/test/Ice/metrics/Server.cs +++ b/csharp/test/Ice/metrics/Server.cs @@ -1,3 +1,4 @@ + // ********************************************************************** // // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. @@ -17,66 +18,39 @@ using System.Reflection; [assembly: AssemblyDescription("Ice test")] [assembly: AssemblyCompany("ZeroC, Inc.")] -public class Server +public class Server : TestCommon.Application { - public static int run(string[] args, Ice.Communicator communicator) + public override int run(string[] args) { - Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); adapter.activate(); - communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); - Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1)); + Ice.ObjectAdapter controllerAdapter = communicator().createObjectAdapter("ControllerAdapter"); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); controllerAdapter.activate(); - communicator.waitForShutdown(); + communicator().waitForShutdown(); return 0; } - public static int Main(string[] args) + protected override Ice.InitializationData getInitData(ref string[] args) { - int status = 0; - Ice.Communicator communicator = null; - -#if !COMPACT && !UNITY - Debug.Listeners.Add(new ConsoleTraceListener()); -#endif - - try - { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(ref args); - initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); - initData.properties.setProperty("Ice.Admin.Endpoints", "tcp"); - initData.properties.setProperty("Ice.Admin.InstanceName", "server"); - initData.properties.setProperty("Ice.Warn.Connections", "0"); - initData.properties.setProperty("Ice.Warn.Dispatch", "0"); - initData.properties.setProperty("Ice.MessageSizeMax", "50000"); - initData.properties.setProperty("Ice.Default.Host", "127.0.0.1"); - communicator = Ice.Util.initialize(ref args, initData); - status = run(args, communicator); - } - catch(System.Exception ex) - { - Console.Error.WriteLine(ex); - status = 1; - } - - if(communicator != null) - { - try - { - communicator.destroy(); - } - catch(Ice.LocalException ex) - { - Console.Error.WriteLine(ex); - status = 1; - } - } + Ice.InitializationData initData = base.getInitData(ref args); + initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0)); + initData.properties.setProperty("Ice.Admin.Endpoints", "tcp"); + initData.properties.setProperty("Ice.Admin.InstanceName", "server"); + initData.properties.setProperty("Ice.Warn.Connections", "0"); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); + initData.properties.setProperty("Ice.MessageSizeMax", "50000"); + initData.properties.setProperty("Ice.Default.Host", "127.0.0.1"); + return initData; + } - return status; + public static int Main(string[] args) + { + Server app = new Server(); + return app.runmain(args); } } |