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
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/HostInit.java (file contents):
Revision 1.26 by tdb, Tue Mar 13 13:40:26 2001 UTC vs.
Revision 1.31 by tdb, Mon May 20 11:38:14 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * Copyright (C) 2000-2002 i-scream
4 + *
5 + * This program is free software; you can redistribute it and/or
6 + * modify it under the terms of the GNU General Public License
7 + * as published by the Free Software Foundation; either version 2
8 + * of the License, or (at your option) any later version.
9 + *
10 + * This program is distributed in the hope that it will be useful,
11 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13 + * GNU General Public License for more details.
14 + *
15 + * You should have received a copy of the GNU General Public License
16 + * along with this program; if not, write to the Free Software
17 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
18 + */
19 +
20   //---PACKAGE DECLARATION---
21 < package uk.ac.ukc.iscream.filtermanager;
21 > package uk.org.iscream.cms.server.filtermanager;
22  
23   //---IMPORTS---
24 < import uk.ac.ukc.iscream.core.*;
25 < import uk.ac.ukc.iscream.filter.*;
26 < import uk.ac.ukc.iscream.util.*;
27 < import uk.ac.ukc.iscream.componentmanager.*;
24 > import uk.org.iscream.cms.server.core.*;
25 > import uk.org.iscream.cms.server.filter.*;
26 > import uk.org.iscream.cms.server.util.*;
27 > import uk.org.iscream.cms.server.componentmanager.*;
28   import java.net.*;
29   import java.io.*;
30   import java.util.*;
# Line 95 | Line 114 | class HostInit extends Thread {
114              getInBound("FILTER");
115                  // send info
116                  String filterList = cp.getProperty(configName, "Host.filter");
117 <                Filter filterRef = null;
117 >                FilterInfo filterInfoRef = null;
118                  String filter = null;
119                  StringTokenizer st = new StringTokenizer(filterList, ";");
120 <            while (filterRef==null && st.hasMoreTokens()) {
120 >            while (filterInfoRef==null && st.hasMoreTokens()) {
121                  filter = st.nextToken();
122                  _logger.write(toString(), Logger.DEBUG, " looking for filter- " + filter);
123                  try {
124 <                    filterRef = FilterHelper.narrow(ReferenceManager.getInstance().getCORBARef("iscream.Filter." + filter));
124 >                    filterInfoRef = FilterInfoHelper.narrow(ReferenceManager.getInstance().getCORBARef("iscream.FilterInfo." + filter));
125                  } catch (ComponentCORBAException e) {
126                      _logger.write(toString(), Logger.DEBUG, " unable to find filter- " + filter);
127                  }
128              }
129                  
130 <                // hopefully we found a filter
131 <            if(filterRef != null) {
130 >            // hopefully we found a filter
131 >            if(filterInfoRef != null) {
132                  _logger.write(toString(), Logger.DEBUG, " found filter- " + filter);
133 <                // tell the host about it...
134 <                    _socketOut.println(filterRef.getHostName() + ";"
135 <                                     + filterRef.getUDPPort() + ";"
136 <                                     + filterRef.getTCPPort());
133 >                try {
134 >                    // tell the host about it...
135 >                        _socketOut.println(filterInfoRef.getHostName() + ";"
136 >                                         + filterInfoRef.getUDPPort() + ";"
137 >                                         + filterInfoRef.getTCPPort());
138 >                    }
139 >                    catch(org.omg.CORBA.COMM_FAILURE e) {
140 >                        // failed to talk to filter, lets signal an error
141 >                        _socketOut.println("ERROR");
142 >                        throw new IOException("error communicating with filter - " + e);
143 >                    }
144                  }
145                  else {
146                      // ...or throw a wobbly (and tell the host!)
# Line 145 | Line 171 | class HostInit extends Thread {
171       * Overrides the {@link java.lang.Object#toString() Object.toString()}
172       * method to provide clean logging (every class should have this).
173       *
174 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
174 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
175       * to format the toString()
176       *
177       * @return the name of this class and its CVS revision

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines