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.14 by ajm, Wed Dec 13 13:36:46 2000 UTC vs.
Revision 1.35 by tdb, Sat May 18 18:16:02 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.filter;
21 > package uk.org.iscream.cms.server.filter;
22  
23   //---IMPORTS---
24   import java.io.*;
25   import java.net.*;
26   import java.util.*;
27 < import uk.ac.ukc.iscream.core.*;
28 < import uk.ac.ukc.iscream.filter.*;
29 < import uk.ac.ukc.iscream.util.*;
27 > import uk.org.iscream.cms.server.core.*;
28 > import uk.org.iscream.cms.server.componentmanager.*;
29 > import uk.org.iscream.cms.server.filter.*;
30 > import uk.org.iscream.cms.server.util.*;
31  
32   /**
33   * Handle an incoming packet as a separate thread.
34   * Passes the data through various plugins, then
35   * passes it on to the parent filter.
36   *
37 + * Now grabs data from a single queue, rather than
38 + * waiting to be contacted.
39 + *
40   * @author  $Author$
41   * @version $Id$
42   */
# Line 29 | Line 52 | public class FilterThread extends Thread{
52   //---STATIC METHODS---
53  
54   //---CONSTRUCTORS---
55 <
55 >  
56      /**
57 <     * Class constructor. Obtains the byte[] from a DatagramPacket.
57 >     * Constructs an instance of a FilterThread
58 >     *
59 >     * @param queue the Queue this filter is using
60       */
61 <    public FilterThread(DatagramPacket packet, Filter parent){
62 <        _parent = parent;
63 <        _rawPacket = packet.getData();
39 <        _logger.write(toString(), Logger.DEBUG, "created");
61 >    public FilterThread(Queue queue){
62 >        // set the Thread name
63 >        setName("filter.FilterThread");
64          
65 +        _queue = queue;
66 +        _logger.write(toString(), Logger.SYSINIT, "created");
67      }
42    
43    /**
44     * Class constructor for passing XML Strings.
45     */
46    public FilterThread(String xml, Filter parent){
47        _parent = parent;
48        _rawPacket = xml.getBytes();
49        _logger.write(toString(), Logger.DEBUG, "created");
50    }
68  
69   //---PUBLIC METHODS---
70  
71      /**
72 <     * Runs the thread
72 >     * Runs the thread, getting data from the Queue and
73 >     * sending it on to the parent filter.
74       */
75      public void run(){
76 <
77 <        // Get a string without any null characters in it.
78 <        //  -- maybe String.trim() would be better here ?
79 <        String xml = new String(_rawPacket);
80 <        if (xml.indexOf(0) != -1) {
81 <            xml = xml.substring(0, xml.indexOf(0));
76 >        // setup the XMLPacketMaker
77 >        XMLPacketMaker xmlPacketMaker = new XMLPacketMaker();
78 >        // get a queue for ourselves
79 >        int n = _queue.getQueue();
80 >        // keep these out here, saves recreating the object
81 >        String xml = null;
82 >        String parentFilterName = "";
83 >        Filter parent = null;
84 >        while(true) {
85 >            // get a String of xml
86 >            try {
87 >                xml = (String) _queue.get(n);
88 >            }
89 >            catch (InvalidQueueException e) {
90 >                _logger.write(toString(), Logger.ERROR, "Queue error: "+e);
91 >            }
92 >            
93 >            // Get a string without any null characters in it.
94 >            //  -- maybe String.trim() would be better here ?
95 >            if (xml.indexOf(0) != -1) {
96 >                xml = xml.substring(0, xml.indexOf(0));
97 >            }
98 >            
99 >            // Bundle the XML all on one line (saves space and simplifies
100 >            // the protocol between clientinterface and client).
101 >            StringTokenizer tokenizer = new StringTokenizer(new String(xml), "\n");
102 >            xml = "";
103 >            while (tokenizer.hasMoreTokens()) {
104 >                xml += tokenizer.nextToken();
105 >            }
106 >            
107 >            // Use XMLPacketMaker to make an XMLPacket object.
108 >            XMLPacket packet = null;
109 >            try {
110 >                packet = xmlPacketMaker.createXMLPacket(xml);
111 >            } catch(InvalidXMLException e) {
112 >                _logger.write(toString(), Logger.ERROR, "Invalid XML: "+e);
113 >                // skip the rest of this loop iteration
114 >                continue;
115 >            }
116 >            
117 >            // get parent
118 >            try {
119 >                String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
120 >                if(!parentFilterName.equals(newParent)) {
121 >                    parentFilterName = newParent;
122 >                    parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName));
123 >                    _logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName);
124 >                }
125 >            } catch (PropertyNotFoundException e) {
126 >                continue;
127 >            }
128 >                    
129 >            // XMLPacket is ok, run filters...
130 >            if(PluginFilterManager.getInstance().runFilters(packet)) {
131 >                // and pass it on...
132 >                parent.receiveXML(xml);
133 >            }
134 >            else {
135 >                // ... or filtered it
136 >                _logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
137 >            }
138          }
65        else {
66            xml = xml.substring(0, xml.length());
67        }
68        
69        // Use my XMLPacketMaker to make an XMLPacket object.
70        XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
71        XMLPacket packet = xmlPacketMaker.createXMLPacket();
72              
73        if(packet != null && PluginFilterManager.getInstance().runFilters(packet)) {
74            // packet is not null
75            // packet was not dropped by a plugin
76            // ... best pass it on !
77            _parent.receiveXML(xml);
78        }
79        else {
80            // either we had a null, or a plugin dropped it
81            _logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
82        }
83        
139      }
140  
141      /**
142       * Overrides the {@link java.lang.Object#toString() Object.toString()}
143       * method to provide clean logging (every class should have this).
144       *
145 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
145 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
146       * to format the toString()
147       *
148       * @return the name of this class and its CVS revision
# Line 104 | Line 159 | public class FilterThread extends Thread{
159   //---ACCESSOR/MUTATOR METHODS---
160  
161   //---ATTRIBUTES---
107
108    /**
109     * Our parent filter
110     */
111    Filter _parent;
162      
163      /**
164 <     * The raw packet data
164 >     * The Queue object
165       */
166 <    byte[] _rawPacket;
166 >    Queue _queue;
167      
168      /**
169       * This is the friendly identifier of the
# Line 131 | Line 181 | public class FilterThread extends Thread{
181       * system logger that is being used.
182       */
183      private Logger _logger = ReferenceManager.getInstance().getLogger();
184 +
185 +    /**
186 +     * A reference to the reference manager in use
187 +     */
188 +    private ReferenceManager _refman = ReferenceManager.getInstance();
189  
190   //---STATIC ATTRIBUTES---
191  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines