svn commit: r1669853 - in /nutch/trunk: CHANGES.txt src/java/org/apache/nutch/service/NutchServer.java

[mattmann]

Author: mattmann
Date: Sun Mar 29 05:17:37 2015
New Revision: 1669853

URL: http://svn.apache.org/r1669853
Log:
- fix for NUTCH-1976 Allow Users to Set Hostname for Server contributed by 
Tyler Palsulich.

Modified:
    nutch/trunk/CHANGES.txt
    nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java

Modified: nutch/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1669853&r1=1669852&r2=1669853&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Sun Mar 29 05:17:37 2015
@@ -2,6 +2,8 @@ Nutch Change Log
  
 Nutch Current Development 1.10-SNAPSHOT
 
+* NUTCH-1976 Allow Users to Set Hostname for Server (Tyler Palsulich via 
mattmann)
+
 * NUTCH-1941 Optional rolling http.agent.name's (Asitang Mishra, lewismc via 
snagel)
 
 * NUTCH-1959 Improving CommonCrawlFormat implementations (Giuseppe Totaro via 
mattmann)

Modified: nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java
URL: 
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java?rev=1669853&r1=1669852&r2=1669853&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java Sun Mar 29 
05:17:37 2015
@@ -49,9 +49,11 @@ public class NutchServer {
        private static final int JOB_CAPACITY = 100;
 
        private static Integer port = DEFAULT_PORT;
+       private static String host  = LOCALHOST;
 
        private static final String CMD_HELP = "help";
        private static final String CMD_PORT = "port";
+       private static final String CMD_HOST = "host";
 
        private long started;
        private boolean running;
@@ -88,9 +90,9 @@ public class NutchServer {
        }
 
        private void start() {
-               LOG.info("Starting NutchServer on port: {}  ...",port);
+               LOG.info("Starting NutchServer on {}:{}  ...", host, port);
                try{
-                       String address = "http://"; + LOCALHOST + ":" + port;
+                       String address = "http://"; + host + ":" + port;
                        sf.setAddress(address);
                        sf.create();
                }catch(Exception e){
@@ -99,8 +101,8 @@ public class NutchServer {
 
                started = System.currentTimeMillis();
                running = true;
-               LOG.info("Started Nutch Server on port {} at {}", port, 
started);
-               System.out.println("Started Nutch Server on port " + port + " 
at " + started);
+               LOG.info("Started Nutch Server on {}:{} at {}", host, port, 
started);
+               System.out.println("Started Nutch Server on " + host + ":" + 
port + " at " + started);
        }
 
        public List<Class<?>> getClasses() {
@@ -134,6 +136,11 @@ public class NutchServer {
                if (commandLine.hasOption(CMD_PORT)) {
                        port = 
Integer.parseInt(commandLine.getOptionValue(CMD_PORT));
                }
+
+               if (commandLine.hasOption(CMD_HOST)) {
+                       host = commandLine.getOptionValue(CMD_HOST);
+               }
+
                startServer();
        }
 
@@ -147,6 +154,12 @@ public class NutchServer {
                OptionBuilder.hasOptionalArg();
                OptionBuilder.withDescription("The port to run the Nutch 
Server. Default port 8081");
                options.addOption(OptionBuilder.create(CMD_PORT));
+
+               OptionBuilder.withArgName("host");
+               OptionBuilder.hasOptionalArg();
+               OptionBuilder.withDescription("The host to bind the Nutch 
Server to. Default is localhost.");
+               options.addOption(OptionBuilder.create(CMD_PORT));
+
                return options;
        }