ViewVC Help

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

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterMain.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterMain.java (file contents):
Revision 1.32 by tdb, Tue Mar 19 16:37:28 2002 UTC vs.
Revision 1.33 by tdb, Wed Mar 20 13:05:49 2002 UTC

#	Line 57 | Line 57 | public class FilterMain implements Component {
57
58		// check for TCP Reader
59		try {
60	<	int tcp = Integer.parseInt(cp.getProperty(FilterMain.NAME, "Filter.ActivateTCPReader"));
60	>	int tcp = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Filter.ActivateTCPReader"));
61		activateTCPReader = (tcp == 1);
62		} catch (PropertyNotFoundException e) {
63		activateTCPReader = false;
#	Line 66 | Line 66 | public class FilterMain implements Component {
66		}
67		// check for UDP Reader
68		try {
69	<	int udp = Integer.parseInt(cp.getProperty(FilterMain.NAME, "Filter.ActivateUDPReader"));
69	>	int udp = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Filter.ActivateUDPReader"));
70		activateUDPReader = (udp == 1);
71		} catch (PropertyNotFoundException e) {
72		activateUDPReader = false;
#	Line 75 | Line 75 | public class FilterMain implements Component {
75		}
76		// check for CORBA Reader
77		try {
78	<	int corba = Integer.parseInt(cp.getProperty(FilterMain.NAME, "Filter.ActivateCORBAReader"));
78	>	int corba = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Filter.ActivateCORBAReader"));
79		activateCORBAReader = (corba == 1);
80		} catch (PropertyNotFoundException e) {
81		activateCORBAReader = false;
#	Line 91 | Line 91 | public class FilterMain implements Component {
91		if(activateTCPReader || activateUDPReader || activateCORBAReader) {
92		// see if this Queue needs a size limit
93		try {
94	<	int queueSizeLimit = Integer.parseInt(cp.getProperty(FilterMain.NAME, "Queue.SizeLimit"));
95	<	String queueRemoveAlgorithm = cp.getProperty(FilterMain.NAME, "Queue.RemoveAlgorithm");
94	>	int queueSizeLimit = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Queue.SizeLimit"));
95	>	String queueRemoveAlgorithm = cp.getProperty("Filter." + FilterMain.NAME, "Queue.RemoveAlgorithm");
96		int algorithm = StringUtils.getStringPos(queueRemoveAlgorithm, Queue.algorithms);
97		if(algorithm != -1) {
98		_logger.write(toString(), Logger.DEBUG, "Starting Queue with size limit of "+queueSizeLimit+", using remove algorithm "+queueRemoveAlgorithm);
#	Line 118 | Line 118 | public class FilterMain implements Component {
118		// startup a monitor on this queue
119		try {
120		// try to get the interval, if this fails, we won't start up the monitor
121	<	int queueMonitorInterval = Integer.parseInt(cp.getProperty(FilterMain.NAME, "Queue.MonitorInterval"));
121	>	int queueMonitorInterval = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Queue.MonitorInterval"));
122		String queueName = NAME + " Filter";
123		queue.startMonitor(queueMonitorInterval*1000, queueName);
124		} catch (PropertyNotFoundException e) {
#	Line 144 | Line 144 | public class FilterMain implements Component {
144		if(activateTCPReader) {
145		try {
146		// get the port number from the configuration
147	<	TCPListenPort = Integer.parseInt(cp.getProperty(FilterMain.NAME, "Filter.TCPListenPort"));
147	>	TCPListenPort = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Filter.TCPListenPort"));
148		// start the TCPReader
149		_logger.write(toString(), Logger.SYSINIT, "starting Filter TCP listener");
150		TCPReader tcpReader = new TCPReader(TCPListenPort, queue);
#	Line 160 | Line 160 | public class FilterMain implements Component {
160		if(activateUDPReader) {
161		try {
162		// get the port number from the configuration
163	<	UDPListenPort = Integer.parseInt(cp.getProperty(FilterMain.NAME, "Filter.UDPListenPort"));
163	>	UDPListenPort = Integer.parseInt(cp.getProperty("Filter." + FilterMain.NAME, "Filter.UDPListenPort"));
164		// start the UDPReader
165		_logger.write(toString(), Logger.SYSINIT, "starting Filter UDP listener");
166		UDPReader udpReader = new UDPReader(UDPListenPort, queue);
#	Line 197 | Line 197 | public class FilterMain implements Component {
197		obj = _refman.getCORBARef("iscream.ConfigurationManager");
198		// then suss out our parent filter
199		ConfigurationProxy cp = ConfigurationProxy.getInstance();
200	<	String parentFilterName = cp.getProperty(NAME, "Filter.parentFilter");
200	>	String parentFilterName = cp.getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
201		// finally check the parent filter is alive
202		obj = _refman.getCORBARef("iscream.Filter." + parentFilterName);
203		} catch(ComponentCORBAException e) {

Diff Legend

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