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/FilterThread.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterThread.java (file contents):
Revision 1.24 by tdb, Mon Feb 12 00:45:57 2001 UTC vs.
Revision 1.37 by tdb, Fri Sep 6 15:10:48 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org.uk
4 + * Copyright (C) 2000-2002 i-scream
5 + *
6 + * This program is free software; you can redistribute it and/or
7 + * modify it under the terms of the GNU General Public License
8 + * as published by the Free Software Foundation; either version 2
9 + * of the License, or (at your option) any later version.
10 + *
11 + * This program is distributed in the hope that it will be useful,
12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 + * GNU General Public License for more details.
15 + *
16 + * You should have received a copy of the GNU General Public License
17 + * along with this program; if not, write to the Free Software
18 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19 + */
20 +
21   //---PACKAGE DECLARATION---
22 < package uk.ac.ukc.iscream.filter;
22 > package uk.org.iscream.cms.server.filter;
23  
24   //---IMPORTS---
25   import java.io.*;
26   import java.net.*;
27   import java.util.*;
28 < import uk.ac.ukc.iscream.core.*;
29 < import uk.ac.ukc.iscream.componentmanager.*;
30 < import uk.ac.ukc.iscream.filter.*;
31 < import uk.ac.ukc.iscream.util.*;
28 > import uk.org.iscream.cms.server.core.*;
29 > import uk.org.iscream.cms.server.componentmanager.*;
30 > import uk.org.iscream.cms.server.filter.*;
31 > import uk.org.iscream.cms.server.util.*;
32  
33   /**
34   * Handle an incoming packet as a separate thread.
# Line 38 | Line 58 | public class FilterThread extends Thread{
58       * Constructs an instance of a FilterThread
59       *
60       * @param queue the Queue this filter is using
41 –     * @param parent a CORBA reference to our parent filter
61       */
62 <    public FilterThread(Queue queue, Filter parent){
63 <        _parent = parent;
62 >    public FilterThread(Queue queue){
63 >        // set the Thread name
64 >        setName("filter.FilterThread");
65 >        
66          _queue = queue;
67          _logger.write(toString(), Logger.SYSINIT, "created");
68      }
# Line 53 | Line 74 | public class FilterThread extends Thread{
74       * sending it on to the parent filter.
75       */
76      public void run(){
77 +        // setup the XMLPacketMaker
78 +        XMLPacketMaker xmlPacketMaker = new XMLPacketMaker();
79          // get a queue for ourselves
80          int n = _queue.getQueue();
81          // keep these out here, saves recreating the object
82          String xml = null;
83 +        String parentFilterName = "";
84 +        Filter parent = null;
85          while(true) {
86              // get a String of xml
87              try {
# Line 71 | Line 96 | public class FilterThread extends Thread{
96              if (xml.indexOf(0) != -1) {
97                  xml = xml.substring(0, xml.indexOf(0));
98              }
74 –            else {
75 –                xml = xml.substring(0, xml.length());
76 –            }
99              
100              // Bundle the XML all on one line (saves space and simplifies
101              // the protocol between clientinterface and client).
# Line 84 | Line 106 | public class FilterThread extends Thread{
106              }
107              
108              // Use XMLPacketMaker to make an XMLPacket object.
109 <            XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
110 <            XMLPacket packet = xmlPacketMaker.createXMLPacket();
111 <                  
112 <            if(packet != null) {
113 <                // packet is not null
114 <                // packet was not dropped by a plugin
115 <                // ... best pass it on !
116 <                if(PluginFilterManager.getInstance().runFilters(packet)) {
117 <                    _parent.receiveXML(xml);
109 >            XMLPacket packet = null;
110 >            try {
111 >                packet = xmlPacketMaker.createXMLPacket(xml);
112 >            } catch(InvalidXMLException e) {
113 >                _logger.write(toString(), Logger.ERROR, "Invalid XML: "+e);
114 >                // skip the rest of this loop iteration
115 >                continue;
116 >            }
117 >            
118 >            // get parent
119 >            try {
120 >                String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
121 >                if(!parentFilterName.equals(newParent)) {
122 >                    parentFilterName = newParent;
123 >                    parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter\\." + parentFilterName));
124 >                    _logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName);
125                  }
126 <                else {
127 <                    // we filtered it
99 <                    _logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
100 <                }
126 >            } catch (PropertyNotFoundException e) {
127 >                continue;
128              }
129 +                    
130 +            // XMLPacket is ok, run filters...
131 +            if(PluginFilterManager.getInstance().runFilters(packet)) {
132 +                // and pass it on...
133 +                parent.receiveXML(xml);
134 +            }
135              else {
136 <                // we had a null
137 <                _logger.write(toString(), Logger.DEBUG, "A packet containing ill-parsing XML was rejected.");
136 >                // ... or filtered it
137 >                _logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
138              }
139          }
140      }
# Line 110 | Line 143 | public class FilterThread extends Thread{
143       * Overrides the {@link java.lang.Object#toString() Object.toString()}
144       * method to provide clean logging (every class should have this).
145       *
146 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
146 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
147       * to format the toString()
148       *
149       * @return the name of this class and its CVS revision
# Line 127 | Line 160 | public class FilterThread extends Thread{
160   //---ACCESSOR/MUTATOR METHODS---
161  
162   //---ATTRIBUTES---
130 –
131 –    /**
132 –     * Our parent filter
133 –     */
134 –    Filter _parent;
163      
164      /**
165       * The Queue object
# Line 154 | Line 182 | public class FilterThread extends Thread{
182       * system logger that is being used.
183       */
184      private Logger _logger = ReferenceManager.getInstance().getLogger();
185 +
186 +    /**
187 +     * A reference to the reference manager in use
188 +     */
189 +    private ReferenceManager _refman = ReferenceManager.getInstance();
190  
191   //---STATIC ATTRIBUTES---
192  

Diff Legend

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