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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filtermanager/HostListener.java (file contents):
Revision 1.5 by tdb, Thu Jan 18 23:17:54 2001 UTC vs.
Revision 1.10 by tdb, Wed Mar 20 12:56:37 2002 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.filtermanager;
2 > package uk.org.iscream.cms.server.filtermanager;
3  
4   //---IMPORTS---
5 < import uk.ac.ukc.iscream.core.*;
6 < import uk.ac.ukc.iscream.componentmanager.*;
7 < import uk.ac.ukc.iscream.filter.*;
8 < import uk.ac.ukc.iscream.util.*;
5 > import uk.org.iscream.cms.server.core.*;
6 > import uk.org.iscream.cms.server.componentmanager.*;
7 > import uk.org.iscream.cms.server.filter.*;
8 > import uk.org.iscream.cms.server.util.*;
9   import java.net.*;
10   import java.io.*;
11  
# Line 35 | Line 35 | class HostListener extends Thread {
35       *
36           * @param listenPort The port that the server will listen on.
37           */
38 <    public HostListener(int listenPort) {
39 <        _listenPort = listenPort;
38 >    public HostListener() {
39 >        // set the Thread name
40 >        setName("filtermanager.HostListener");
41 >        
42          _logger.write(toString(), Logger.SYSINIT, "started");
43      }
44  
43 –    
44 –
45   //---PUBLIC METHODS---
46  
47          /**
# Line 52 | Line 52 | class HostListener extends Thread {
52           * and then passing them off to other processes to deal with.
53           */
54      public void run(){
55 +        // get our ACL from the configuration
56 +        ACL acl = null;
57 +        try {
58 +            String stringACL = ConfigurationProxy.getInstance().getProperty("FilterManager", "FilterManager.ACL");
59 +            acl = new ACL(stringACL);
60 +        }
61 +        catch(PropertyNotFoundException e) {
62 +            _logger.write(toString(), Logger.WARNING, "No ACL found for FilterManager: " + e);
63 +        }
64 +        
65          ServerSocket listenSocket=null;
66                  // We use this boolean so we can break out of the while loop if we want
67          boolean run = true;
68          try{
69 +            // Work out the port we want
70 +            int listenPort = Integer.parseInt(ConfigurationProxy.getInstance().getProperty("FilterManager", "FilterManager.listenPort"));
71                          // Setup the ServerSocket so that clients can connect
72 <            listenSocket = new ServerSocket(_listenPort);
73 <        }
74 <        catch(IOException e){
75 <        }
76 <                // Log what machine/port we're listening on
77 <                try{
78 <                        _logger.write(toString(), Logger.SYSMSG, "Server listening on "
72 >                        // use an ACLServerSocket if we have an ACL
73 >                        if(acl != null) {
74 >                            listenSocket = new ACLServerSocket(acl, listenPort);
75 >                        }
76 >                        else {
77 >                listenSocket = new ServerSocket(listenPort);
78 >            }
79 >            _logger.write(toString(), Logger.SYSMSG, "Server listening on "
80                                                                                  +InetAddress.getLocalHost().getHostName()
81                                                                                  +"/"+InetAddress.getLocalHost().getHostAddress()
82                                                                                  +" port "+listenSocket.getLocalPort());
83 <                }
84 <                catch(UnknownHostException e){
83 >            
84 >        }
85 >        catch(UnknownHostException e){
86                          _logger.write(toString(), Logger.SYSMSG, "Server listening on UnknownHost "
87                                                                                  +"port "+listenSocket.getLocalPort());
88                  }
89 +        catch(IOException e){
90 +            _logger.write(toString(), Logger.FATAL, "IO Error, can't start FilterManager :"+e);
91 +            run = false;
92 +        }
93 +        catch(PropertyNotFoundException e){
94 +            _logger.write(toString(), Logger.FATAL, "Fatal Error, can't find config :"+e);
95 +            run = false;
96 +        }
97 +        catch(NumberFormatException e){
98 +            _logger.write(toString(), Logger.FATAL, "Invalid port configuration found :"+e);
99 +            run = false;
100 +        }
101 +
102                  // Loop round constantly until we decide to stop
103          while(run){
104              Socket hostSocket=null;
# Line 105 | Line 132 | class HostListener extends Thread {
132       * Overrides the {@link java.lang.Object#toString() Object.toString()}
133       * method to provide clean logging (every class should have this).
134       *
135 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
135 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
136       * to format the toString()
137       *
138       * @return the name of this class and its CVS revision
# Line 139 | Line 166 | class HostListener extends Thread {
166       * be changed to null for utility classes.
167       */
168      private String _name = FilterManager.NAME;
142 –    
143 –    /**
144 –         * The port on which the server should listen.
145 –         */
146 –    private int _listenPort;
169      
170   //---STATIC ATTRIBUTES---
171  

Diff Legend

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