ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/CorbaControlHandlerServant.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/CorbaControlHandlerServant.java (file contents):
Revision 1.3 by tdb, Mon Feb 5 00:58:46 2001 UTC vs.
Revision 1.16 by tdb, Tue May 21 16:47:16 2002 UTC

#	Line 1 | Line 1
1	+	/*
2	+	* i-scream central monitoring system
3	+	* http://www.i-scream.org.uk
4	+	* Copyright (C) 2000-2002 i-scream
5	+	*
6	+	* This program is free software; you can redistribute it and/or
7	+	* modify it under the terms of the GNU General Public License
8	+	* as published by the Free Software Foundation; either version 2
9	+	* of the License, or (at your option) any later version.
10	+	*
11	+	* This program is distributed in the hope that it will be useful,
12	+	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	+	* GNU General Public License for more details.
15	+	*
16	+	* You should have received a copy of the GNU General Public License
17	+	* along with this program; if not, write to the Free Software
18	+	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19	+	*/
20	+
21		//---PACKAGE DECLARATION---
22	<	package uk.ac.ukc.iscream.clientinterface;
22	>	package uk.org.iscream.cms.server.clientinterface;
23
24		//---IMPORTS---
25	<	import uk.ac.ukc.iscream.util.*;
26	<	import uk.ac.ukc.iscream.componentmanager.*;
27	<	import uk.ac.ukc.iscream.core.*;
28	<	import uk.ac.ukc.iscream.client.*;
25	>	import uk.org.iscream.cms.server.util.*;
26	>	import uk.org.iscream.cms.server.componentmanager.*;
27	>	import uk.org.iscream.cms.server.core.*;
28	>	import uk.org.iscream.cms.server.client.*;
29
30
31		/**
32		* Acts as a Control Handler to a CORBA based client.
33		*
14	–	* !!! FUNDAMENTAL DESIGN PROBLEM !!!
15	–	* !!! Need a way to "shutdown" this class !!!
16	–	*
34		* @author  $Author$
35		* @version $Id$
36		*/
#	Line 35 | Line 52 | class CorbaControlHandlerServant extends CorbaControlH
52		*
53		* @param packetSorter A reference to the PacketSorter in the component
54		* @param client A reference to the "servant" part of the connecting client.
55	+	* @param queueMonitorInterval The interval at which to monitor our Queue.
56	+	* @param clientname A name to identify the client.
57		*/
58	<	public CorbaControlHandlerServant(PacketSorter packetSorter, Client client) {
58	>	public CorbaControlHandlerServant(PacketSorter packetSorter, Client client, String clientname) {
59		_packetSorter = packetSorter;
60		_hostList = "";
61		_client = client;
62	+	_clientname = clientname;
63		_dataHandler = null;
64		_logger.write(toString(), Logger.SYSINIT, "created");
65		}
#	Line 54 | Line 74 | class CorbaControlHandlerServant extends CorbaControlH
74		public boolean startData() {
75		if(_dataHandler == null) {
76		// create a new DataHandler
77	<	CorbaDataHandler dh = new CorbaDataHandler(_client);
77	>	CorbaDataHandler dh = new CorbaDataHandler(_client, this);
78		// register the Queue
79		_packetSorter.register(dh.getQueue(), _hostList);
80	+	try {
81	+	// startup a monitor on the DataHandler's queue
82	+	ConfigurationProxy cp = ConfigurationProxy.getInstance();
83	+	int queueMonitorInterval = Integer.parseInt(cp.getProperty("ClientInterface", "Queue.MonitorInterval"));
84	+	String queueName = _name + " CorbaHandler:"+_clientname;
85	+	dh.getQueue().startMonitor(queueMonitorInterval*1000, _packetSorter.getQueue(), queueName);
86	+	} catch (PropertyNotFoundException e) {
87	+	_logger.write(toString(), Logger.WARNING, "failed to find queue monitor config, disabling. " + e);
88	+	}
89		// start the DataHandler running
90		dh.start();
91		// keep a reference
#	Line 106 | Line 135 | class CorbaControlHandlerServant extends CorbaControlH
135		}
136
137		/**
138	+	* Disconnect, this will shutdown the data and unhook from
139	+	* the CORBA ORB.
140	+	*/
141	+	public void disconnect() {
142	+	// close the data handler
143	+	stopData();
144	+	// disconnect from the ORB
145	+	try {
146	+	byte[] oid = _refman.getRootPOA().servant_to_id(this);
147	+	_refman.getRootPOA().deactivate_object(oid);
148	+	} catch(Exception e) {
149	+	_logger.write(this.toString(), Logger.ERROR, "disconnect failed: "+e);
150	+	}
151	+	}
152	+
153	+	/**
154		* Overrides the {@link java.lang.Object#toString() Object.toString()}
155		* method to provide clean logging (every class should have this).
156		*
157	<	* This uses the uk.ac.ukc.iscream.util.NameFormat class
157	>	* This uses the uk.org.iscream.cms.server.util.NameFormat class
158		* to format the toString()
159		*
160		* @return the name of this class and its CVS revision
#	Line 123 | Line 168 | class CorbaControlHandlerServant extends CorbaControlH
168
169		//---PRIVATE METHODS---
170
171	+	/**
172	+	* Overridden for debugging purposes
173	+	* to see when an instance of this class
174	+	* is destroyed
175	+	*/
176	+	protected void finalize() throws Throwable {
177	+	_logger.write(this.toString(), Logger.DEBUG, "finalized by GC");
178	+	}
179	+
180		//---ACCESSOR/MUTATOR METHODS---
181
182		//---ATTRIBUTES---
#	Line 143 | Line 197 | class CorbaControlHandlerServant extends CorbaControlH
197		* system logger that is being used.
198		*/
199		private Logger _logger = ReferenceManager.getInstance().getLogger();
200	+
201	+	/**
202	+	* A reference to the reference manager in use
203	+	*/
204	+	private ReferenceManager _refman = ReferenceManager.getInstance();
205
206		/**
207		* A reference to the PacketSorter.
#	Line 163 | Line 222 | class CorbaControlHandlerServant extends CorbaControlH
222		* A reference to our DataHandler, if we have one
223		*/
224		private CorbaDataHandler _dataHandler;
225	+
226	+	/**
227	+	* A name to identify the client
228	+	*/
229	+	private String _clientname;
230
231		//---STATIC ATTRIBUTES---
232

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines