Changeset 32432 for main/trunk/greenstone2

Timestamp:

2018-09-07T19:39:40+12:00 (6 years ago)

Author:

ak19

Message:

1. Since there's a chance that 127.0.0.1 isn't always the loopback address or may not always work, we allow this to be specified by the new property localhost.server.http in build.properties. Updating recently commited code that is affected by this and where I had been hardcoding 127.0.0.1. 2. Fixing up the port and now the server host name used by the solr extension: these should be the correct property names, which are localhost.port.http and the new localhost.server.http instead of tomcat.server and the default port for the default protocol, since all GS3 internal communications with solr are done through the local HTTP url, whatever the public URL (with default protocol, matching port and server name) might be. I also updated the get-solr-servlet-url target in build.xml to use the local http base URL (see point 3), so that solr building will work correctly. 3. build.xml now has 2 new targets, one to get the local http base URL and one to get the local http default servlet URL. Both also use the new localhost.server.http property, besides the recently introduced localhost.port.http property. 4. Now the default behaviour of util.pm::get_full_greenstone_url_prefix() is to call the new get-local-http-servlet-url ant target, since only activate.pl's servercontrol.pm helper module uses it. If you want util.pm::get_full_greenstone_url_prefix() to return the non-local (public) servlet URL, pass in 1 (true) for the new 3rd parameter. The important decision here is that activate will use the internal (i.e. local http) greenstone servlet URL to issue pinging and (de)activating commands, since localhost (specifically 127.0.0.1) over http is now always available and because a domain named server over https will create complications to do with certification checks by wget, when wget gets run by activate.pl. Alternatively, activate.pl/servercontrol.pm could run wget with the no-cert-checking flag or we could make wget check the GS3 https certificate if one exists. But all that is convoluted and unnecessary: we've so far always worked with http, and usually with localhost over the httpport, and activate.pl so far has worked well with this, so have some confidence that using the local http URL internally should still work, even if the default GS3 URL has been set up to be a public (https) URL.

Location:

main/trunk/greenstone2/perllib

Files:

• servercontrol.pm (modified) (1 diff)
• util.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -385 +385 @@
     # For GS2, we derive the URL from the llssite.cfg file.
 
-    my $url = &util::get_full_greenstone_url_prefix($gs_mode, $lib_name); # found largely identical method copied
-            # into util. Don't want duplicates, so calling that from here.
-    
-    # either the url is still undef or it is now set
+    # note that unless we pass in $get_public_url=1, we now get the local http URL
+    # by default (e.g. http://127.0.0.1:httpPort/greenstone/library)
+    my $url = &util::get_full_greenstone_url_prefix($gs_mode, $lib_name); # found largely identical method copied
+        # into util.pm. Don't want duplicates, so calling that from here.
+    
+    # either the url is still undef or it is now set
     #print STDERR "\n@@@@@ final URL:|$url|\n" if $url;     
     #print STDERR "\n@@@@@ URL still undef\n" if !$url;

main/trunk/greenstone2/perllib/util.pm

@@ -1292 +1292 @@
 #
 # Designed to work with a server included with GS.
-#  - For GS3, we ask ant for the library URL.
 #  - For GS2, we derive the URL from the llssite.cfg file.
+#  - For GS3, we ask ant for the library URL. For GS3, we get the local *http* URL
+# by default, something like http://127.0.0.1:<httpPort>/greenstone3/library).
+# Pass in $get_public_url=1 to get something like
+# <default.protocol>://<tomcat.server>:<default.port>/greenstone/library
 
 sub get_full_greenstone_url_prefix
 {   
-    my ($gs_mode, $lib_name) = @_;
+    my ($gs_mode, $lib_name, $get_public_url) = @_;
     
     # if already set on a previous occasion, just return that
@@ -1371 +1374 @@
     # app.name is stored in app.path by build.xml. Need to move app.name in build.properties from build.xml
     
-    # Or, run the new target get-default-servlet-url
+    # Or, run the new target get-local-http-servlet-url / get-default-servlet-url
     # the output can look like:
     #
@@ -1385 +1388 @@
     # - see http://stackoverflow.com/questions/799968/whats-the-difference-between-perls-backticks-system-and-exec
     
-    # The get-default-servlet-url ant target can be run from anywhere by specifying the
+    # The get-local-http-servlet-url (or get-default-servlet-url) ant target can be run from anywhere by specifying the
     # location of GS3's ant build.xml buildfile. Activate.pl can be run from anywhere for GS3
     # GSDL3SRCHOME will be set for GS3 by gs3-setup.sh, a step that would have been necessary
     # to run the activate.pl script in the first place
     
+    # The default is to get-local-http-servlet-url (of the form http://127.0.0.1:<httpPort>/greentone3/library)
     my $full_build_xml = &FileUtils::javaFilenameConcatenate($ENV{'GSDL3SRCHOME'},"build.xml");
 
-    my $perl_command = "ant -buildfile \"$full_build_xml\" get-default-servlet-url";
+    my $perl_command = $get_public_url ? "get-default-servlet-url" : "get-local-http-servlet-url";
+    $perl_command = "ant -buildfile \"$full_build_xml\" $perl_command"; 
     
     if (open(PIN, "$perl_command |")) {