11 |
|
import java.io.*; |
12 |
|
import org.omg.CORBA.*; |
13 |
|
import org.omg.CosNaming.*; |
14 |
+ |
import uk.ac.ukc.iscream.util.*; |
15 |
|
|
16 |
|
/** |
17 |
|
* <ONE LINE DESCRIPTION> |
33 |
|
|
34 |
|
//---CONSTRUCTORS--- |
35 |
|
|
36 |
< |
public TCPReaderInit(Socket socket, ConfigurationManager configManager, Logger logRef, Filter parent) throws IOException { |
36 |
< |
_configManager = configManager; |
37 |
< |
_logRef = logRef; |
36 |
> |
public TCPReaderInit(Socket socket, Filter parent) throws IOException { |
37 |
|
_socket = socket; |
38 |
|
_parent = parent; |
39 |
|
_socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream())); |
40 |
|
_socketOut = new PrintWriter(_socket.getOutputStream()); |
41 |
< |
_logRef.write(toString(), Logger.SYSINIT, "created"); |
41 |
> |
_logger.write(toString(), Logger.SYSINIT, "created"); |
42 |
|
} |
43 |
|
|
44 |
|
//---PUBLIC METHODS--- |
45 |
|
|
47 |
– |
//NEED TO MAJORILY CHANGE THIS BIT ! |
46 |
|
public void run() { |
47 |
|
try { |
48 |
|
//variables |
103 |
|
String ipadd = _socket.getInetAddress().getHostAddress(); |
104 |
|
String xml = "<packet type=\"heartbeat\" machine_name=\""+hostname+"\" date=\""+date+"\" ip=\""+ipadd+"\"></packet>"; |
105 |
|
|
106 |
< |
FilterThread t = new FilterThread(xml, _parent, _logRef); |
106 |
> |
FilterThread t = new FilterThread(xml, _parent); |
107 |
|
t.start(); |
108 |
|
|
109 |
|
} catch (Exception e) { |
110 |
< |
_logRef.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage()); |
110 |
> |
_logger.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage()); |
111 |
|
} |
112 |
|
|
113 |
|
_socketOut.flush(); |
117 |
|
_socketOut.close(); |
118 |
|
_socket.close(); |
119 |
|
} catch (IOException e) { |
120 |
< |
_logRef.write(toString(), Logger.ERROR, "exception on socket close"); |
120 |
> |
_logger.write(toString(), Logger.ERROR, "exception on socket close"); |
121 |
|
} |
122 |
< |
_logRef.write(toString(), Logger.SYSMSG, "finished"); |
122 |
> |
_logger.write(toString(), Logger.SYSMSG, "finished"); |
123 |
|
} |
124 |
|
|
125 |
|
/** |
140 |
|
|
141 |
|
//---ATTRIBUTES--- |
142 |
|
|
143 |
< |
ConfigurationManager _configManager; |
144 |
< |
Logger _logRef; |
143 |
> |
ConfigurationManager _configManager = ReferenceManager.getInstance().getCM(); |
144 |
> |
Logger _logger = ReferenceManager.getInstance().getLogger(); |
145 |
|
Socket _socket; |
146 |
|
BufferedReader _socketIn; |
147 |
|
PrintWriter _socketOut; |