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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/UDPReader.java (file contents):
Revision 1.10 by ajm, Wed Dec 13 13:36:46 2000 UTC vs.
Revision 1.24 by tdb, Tue May 21 16:47:17 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.filter.*;
30 < 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   * This class contains the main method to be run by
35 < * the filter children.  It harvests UDP traffic.
35 > * the filterd.  It harvests UDP traffic, and queues it.
36   *
37   * @author  $Author$
38   * @version $Id$
# Line 25 | Line 46 | public class UDPReader extends Thread{
46       */
47      public final String REVISION = "$Revision$";
48      
49 +    /**
50 +     * The maximum size of a packet
51 +     */
52 +    private final int packetSizeLimit = 8192;  
53 +    
54   //---STATIC METHODS---
55  
56   //---CONSTRUCTORS---
57  
58      /**
59 <     * It is normal to use this constructor in preference
60 <     * to any other in this class.
59 >     * Constructs a new UDPReader.
60 >     *
61 >     * @param port The port on which we listen for UDP data
62 >     * @param queue The queue which we are using
63       */
64 <    public UDPReader(int port, Filter parent){
64 >    public UDPReader(int port, Queue queue){
65 >        // set the Thread name
66 >        setName("filter.UDPReader");
67 >        
68          _port = port;
69 <        _parent = parent;
69 >        _queue = queue;
70 >        _logger.write(toString(), Logger.SYSINIT, "started");
71      }
72  
73   //---PUBLIC METHODS---
74 <
74 >    
75 >    /**
76 >     * The main method in the class. Reads and queues XML sent
77 >     * over UDP.
78 >     */
79      public void run() {
80 <
80 >        // setup an empty ACL defaulting to ALLOW
81 >        ACL acl = new ACL(ACL.ALLOW);
82 >        
83 >        // setup a Datagram socket
84          DatagramSocket socket = null;
85          try {
86 <            socket = new DatagramSocket(_port);
86 >            socket = new ACLDatagramSocket(acl, _port);
87          }
88          catch (BindException e){
89              _logger.write(this.toString(), Logger.FATAL, "Could not start the UDPReader thread on port "+_port+" as this port was already in use.");
# Line 56 | Line 95 | public class UDPReader extends Thread{
95          }
96          
97          _logger.write(this.toString(), Logger.SYSMSG, "UDPReader thread ready and listening for UDP packets on port "+_port);
98 <
98 >        
99          byte[] buf;
100          
101 +        ConfigurationProxy cp = ConfigurationProxy.getInstance();
102 +        String stringACL = "";
103 +        String newStringACL = "";
104 +        
105 +        // read UDP packets and queue them
106          boolean running = true;
107          while (running){
108 +            // get hold of the ACL in the configuration
109              try {
110 <
111 <                    // receive request and pass on to the FilterThread.                
110 >                newStringACL = cp.getProperty("Filter." + FilterMain.NAME, "Filter.UDPACL");
111 >            }
112 >            catch(PropertyNotFoundException e) {
113 >                // if we can't find it, we'll just use a null ACL
114 >                newStringACL = "";
115 >                _logger.write(toString(), Logger.WARNING, "No ACL found for UDPReader, using empty ACL instead: " + e);
116 >            }
117 >            // check to see if the ACL has changed
118 >            if(!newStringACL.equals(stringACL)) {
119 >                _logger.write(toString(), Logger.SYSMSG, "Reloading Access Control List");
120 >                // clear the ACL
121 >                acl.clear();
122 >                // set the default to something sane
123 >                acl.setDefaultMode(ACL.ALLOW);
124 >                // add the new ACL (this may change the default)
125 >                acl.add(newStringACL);
126 >                stringACL = newStringACL;
127 >            }
128 >            try {
129 >                
130 >                // receive request and put it in the Queue              
131                  buf = new byte[packetSizeLimit];
132                  DatagramPacket packet = new DatagramPacket(buf, buf.length);
133                  socket.receive(packet);
134 <                FilterThread t = new FilterThread(packet, _parent);
135 <                t.start();
72 <
134 >                String xml = new String(packet.getData());
135 >                _queue.add(xml);
136              }
137              catch (IOException e) {
138                  _logger.write(this.toString(), Logger.WARNING, "This UDPReader thread has been shut down as an exception occured: "+e);
139 <                return;
139 >                running = false;
140              }
141          }
142          socket.close();
143      }
144 <
144 >    
145      /**
146       * Overrides the {@link java.lang.Object#toString() Object.toString()}
147       * method to provide clean logging (every class should have this).
148       *
149 +     * This uses the uk.org.iscream.cms.server.util.NameFormat class
150 +     * to format the toString()
151 +     *
152       * @return the name of this class and its CVS revision
153       */
154      public String toString() {
155 <        return this.getClass().getName() + "(" + REVISION.substring(11, REVISION.length() - 2) + ")";
155 >        return FormatName.getName(
156 >            _name,
157 >            getClass().getName(),
158 >            REVISION);
159      }
160  
161   //---PRIVATE METHODS---
# Line 95 | Line 164 | public class UDPReader extends Thread{
164  
165   //---ATTRIBUTES---
166  
167 <    Logger _logger = ReferenceManager.getInstance().getLogger();
167 >    /**
168 >     * This is the friendly identifier of the
169 >     * component this class is running in.
170 >     * eg, a Filter may be called "filter1",
171 >     * If this class does not have an owning
172 >     * component,  a name from the configuration
173 >     * can be placed here.  This name could also
174 >     * be changed to null for utility classes.
175 >     */
176 >    private String _name = FilterMain.NAME;
177 >    
178 >    /**
179 >     * This holds a reference to the
180 >     * system logger that is being used.
181 >     */
182 >    private Logger _logger = ReferenceManager.getInstance().getLogger();
183 >    
184 >    /**
185 >     * The port that this reader is using
186 >     */
187      int _port;
188 <    Filter _parent;    
189 <
190 <    final int packetSizeLimit = 8192;
188 >    
189 >    /**
190 >     * The Queue object
191 >     */
192 >    Queue _queue;
193  
194   //---STATIC ATTRIBUTES---
195  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines