ViewVC Help

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

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/HostInit.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/HostInit.java (file contents):
Revision 1.3 by tdb, Wed Nov 15 00:39:07 2000 UTC vs.
Revision 1.6 by tdb, Mon Nov 20 18:55:24 2000 UTC

#	Line 28 | Line 28 | class HostInit extends Thread {
28
29		//---CONSTRUCTORS---
30
31	<	public HostInit(Socket socket, Configurator configurator, Logger logger) throws IOException {
32	<	_configurator = configurator;
31	>	public HostInit(Socket socket, ConfigurationManager configManager, Logger logger) throws IOException {
32	>	_configManager = configManager;
33		_logger = logger;
34		_socket = socket;
35		_socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
36		_socketOut = new PrintWriter(_socket.getOutputStream());
37	<	_logger.write(toString(), "created");
37	>	_logger.write(toString(), Logger.SYSINIT, "created");
38		}
39
40		//---PUBLIC METHODS---
#	Line 48 | Line 48 | class HostInit extends Thread {
48		throw new IOException("Protocol Error");
49		}
50
51	<	Configuration myConfig = _configurator.getConfiguration(_socket.getInetAddress().getHostName().toLowerCase());
51	>	Configuration myConfig = _configManager.getConfiguration(_socket.getInetAddress().getHostName().toLowerCase());
52		if (myConfig == null) {
53		_socketOut.println("ERROR");
54		throw new IOException("No Configuration File For Host");
#	Line 58 | Line 58 | class HostInit extends Thread {
58
59		// get lastmodified
60		inBound = _socketIn.readLine();
61	<	while(!inBound.equals("LASTMODIFIED")) {
61	>	if(!inBound.equals("LASTMODIFIED")) {
62	>	// protocol error
63		_socketOut.println("ERROR");
64		_socketOut.flush();
65	<	inBound = _socketIn.readLine();
65	>	throw new IOException("Protocol Error");
66		}
67	<	_socketOut.println(myConfig.getLastModified());
68	<	_socketOut.flush();
67	>	else {
68	>	// send info
69	>	_socketOut.println(myConfig.getLastModified());
70	>	_socketOut.flush();
71	>	}
72
73		// get properties
74		inBound = _socketIn.readLine();
#	Line 83 | Line 87 | class HostInit extends Thread {
87		}
88		inBound = _socketIn.readLine();
89		}
90	<	_logger.write(toString(), "configured host");
90	>	_logger.write(toString(), Logger.SYSMSG, "configured host");
91		_socketOut.println("OK");
92		_socketOut.flush();
93		}
94
95		} catch (Exception e) {
96	<	_logger.write(toString(), e.toString());
96	>	_logger.write(toString(), Logger.ERROR, e.toString());
97		}
98
99		_socketOut.flush();
#	Line 99 | Line 103 | class HostInit extends Thread {
103		_socketOut.close();
104		_socket.close();
105		} catch (IOException e) {
106	<	_logger.write(toString(), "exception on socket close");
106	>	_logger.write(toString(), Logger.ERROR, "exception on socket close");
107		}
108	<	_logger.write(toString(), "finished");
108	>	_logger.write(toString(), Logger.SYSMSG, "finished");
109		}
110
111		/**
#	Line 122 | Line 126 | class HostInit extends Thread {
126
127		//---ATTRIBUTES---
128
129	<	Configurator _configurator;
129	>	ConfigurationManager _configManager;
130		Logger _logger;
131		Socket _socket;
132		BufferedReader _socketIn;

Diff Legend

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