1 |
|
//---PACKAGE DECLARATION--- |
2 |
< |
package uk.ac.ukc.iscream.filter; |
2 |
> |
package uk.org.iscream.filter; |
3 |
|
|
4 |
|
//---IMPORTS--- |
5 |
< |
import uk.ac.ukc.iscream.core.*; |
6 |
< |
import uk.ac.ukc.iscream.filter.*; |
5 |
> |
import uk.org.iscream.core.*; |
6 |
> |
import uk.org.iscream.componentmanager.*; |
7 |
> |
import uk.org.iscream.filter.*; |
8 |
|
import java.net.Socket; |
9 |
|
import java.net.ServerSocket; |
10 |
|
import java.io.OutputStream; |
11 |
|
import java.io.IOException; |
12 |
|
import java.net.InetAddress; |
13 |
|
import java.net.UnknownHostException; |
14 |
< |
import org.omg.CORBA.*; |
14 |
< |
import org.omg.CosNaming.*; |
15 |
< |
import uk.ac.ukc.iscream.refman.*; |
14 |
> |
import uk.org.iscream.util.*; |
15 |
|
|
16 |
|
/** |
17 |
< |
* A socket listener to listen for new hosts registering with the system. |
19 |
< |
* When a host makes a connection, the connecton is past to an instance |
20 |
< |
* of the HostInit class, which handles further communication. |
17 |
> |
* Reads TCP Heartbeats from the host applications. |
18 |
|
* |
19 |
|
* @author $Author$ |
20 |
|
* @version $Id$ |
33 |
|
//---CONSTRUCTORS--- |
34 |
|
|
35 |
|
/** |
36 |
< |
* Constructs a new listener |
36 |
> |
* Constructs a new TCPReader |
37 |
|
* |
38 |
< |
* @param logger a reference to the logger we are using |
39 |
< |
* @param configManager a reference to the ConfigurationManager we are using |
43 |
< |
* @param port The port that the server will listen on. |
38 |
> |
* @param queue A reference to our Queue |
39 |
> |
* @param port The port that the TCPReader will listen on |
40 |
|
*/ |
41 |
< |
public TCPReader(int port, Filter parent) { |
41 |
> |
public TCPReader(int port, Queue queue) { |
42 |
> |
// set the Thread name |
43 |
> |
setName("filter.TCPReader"); |
44 |
> |
|
45 |
|
_port = port; |
46 |
< |
_parent = parent; |
46 |
> |
_queue = queue; |
47 |
|
_logger.write(toString(), Logger.SYSINIT, "started"); |
48 |
|
} |
49 |
|
|
83 |
|
while(run){ |
84 |
|
Socket hostSocket=null; |
85 |
|
try{ |
86 |
< |
_logger.write(toString(), Logger.SYSMSG, "Waiting for Connection"); |
86 |
> |
_logger.write(toString(), Logger.DEBUG, "Waiting for Connection"); |
87 |
|
// This will block until a host connects - at which point we get a Socket |
88 |
|
hostSocket = listenPort.accept(); |
89 |
< |
_logger.write(toString(), Logger.SYSMSG, "Connection accepted from: " + hostSocket.toString()); |
89 |
> |
_logger.write(toString(), Logger.DEBUG, "Connection accepted from: " + hostSocket.toString()); |
90 |
|
} |
91 |
|
catch(IOException e){ |
92 |
|
// Something went wrong with the ServerSocket, so we'll stop listening |
95 |
|
// If we've stopped on the line above we won't want to try this ! |
96 |
|
if(run){ |
97 |
|
try { |
98 |
< |
// Setup the HostInit so it can carry on communications with the host |
99 |
< |
TCPReaderInit init = new TCPReaderInit(hostSocket, _parent); |
98 |
> |
// Setup the TCPReaderInit and start it |
99 |
> |
TCPReaderInit init = new TCPReaderInit(hostSocket, _queue); |
100 |
|
// and start it |
101 |
|
init.start(); |
102 |
|
} catch (IOException e) { |
112 |
|
* Overrides the {@link java.lang.Object#toString() Object.toString()} |
113 |
|
* method to provide clean logging (every class should have this). |
114 |
|
* |
115 |
+ |
* This uses the uk.org.iscream.util.NameFormat class |
116 |
+ |
* to format the toString() |
117 |
+ |
* |
118 |
|
* @return the name of this class and its CVS revision |
119 |
|
*/ |
120 |
|
public String toString() { |
121 |
< |
return this.getClass().getName() + "(" + REVISION.substring(11, REVISION.length() - 2) + ")"; |
121 |
> |
return FormatName.getName( |
122 |
> |
_name, |
123 |
> |
getClass().getName(), |
124 |
> |
REVISION); |
125 |
|
} |
126 |
|
|
127 |
|
//---PRIVATE METHODS--- |
131 |
|
//---ATTRIBUTES--- |
132 |
|
|
133 |
|
/** |
134 |
< |
* A reference to the logger the system is using |
134 |
> |
* This is the friendly identifier of the |
135 |
> |
* component this class is running in. |
136 |
> |
* eg, a Filter may be called "filter1", |
137 |
> |
* If this class does not have an owning |
138 |
> |
* component, a name from the configuration |
139 |
> |
* can be placed here. This name could also |
140 |
> |
* be changed to null for utility classes. |
141 |
|
*/ |
142 |
< |
Logger _logger = ReferenceManager.getInstance().getLogger(); |
142 |
> |
private String _name = FilterMain.NAME; |
143 |
> |
|
144 |
> |
/** |
145 |
> |
* This holds a reference to the |
146 |
> |
* system logger that is being used. |
147 |
> |
*/ |
148 |
> |
private Logger _logger = ReferenceManager.getInstance().getLogger(); |
149 |
|
|
150 |
|
/** |
151 |
|
* The port on which the server should listen. |
152 |
|
*/ |
153 |
|
private int _port; |
154 |
|
|
155 |
< |
private Filter _parent; |
155 |
> |
/** |
156 |
> |
* A reference to our Queue |
157 |
> |
*/ |
158 |
> |
private Queue _queue; |
159 |
|
|
160 |
|
//---STATIC ATTRIBUTES--- |
161 |
|
|