[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add User-Agent string to the Query Service federation requests.

2017-04-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/346056 )

Change subject: Add User-Agent string to the Query Service federation requests.
..


Add User-Agent string to the Query Service federation requests.

Change-Id: I156bcb753c214faa597895eba0050cf4a059aa26
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
M dist/src/script/runBlazegraph.sh
2 files changed, 13 insertions(+), 1 deletion(-)

Approvals:
  Smalyshev: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
index a029aa3..e27b572 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
@@ -3,6 +3,8 @@
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpProxy;
 import org.eclipse.jetty.client.ProxyConfiguration;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpHeader;
 
 import com.bigdata.rdf.sail.webapp.client.DefaultHttpClientFactory;
 import com.bigdata.rdf.sail.webapp.client.IHttpClientFactory;
@@ -25,7 +27,10 @@
  * Configuration name for proxy port.
  */
 private static final String HTTP_PROXY_PORT = "http.proxyPort";
-
+/**
+ * Configuration name for User agent.
+ */
+private static final String HTTP_USER_AGENT = "http.userAgent";
 public ProxiedHttpConnectionFactory() {
 defaultFactory = new DefaultHttpClientFactory();
 }
@@ -44,6 +49,10 @@
 proxy.getExcludedAddresses().add("127.0.0.1");
 proxyConfig.getProxies().add(proxy);
 }
+final String userAgent = System.getProperty(HTTP_USER_AGENT);
+if (userAgent != null) {
+client.setUserAgentField(new HttpField(HttpHeader.USER_AGENT, 
userAgent));
+}
 
 return client;
 }
diff --git a/dist/src/script/runBlazegraph.sh b/dist/src/script/runBlazegraph.sh
index b923a15..3027837 100755
--- a/dist/src/script/runBlazegraph.sh
+++ b/dist/src/script/runBlazegraph.sh
@@ -49,6 +49,8 @@
 
 # Q-id of the default globe
 DEFAULT_GLOBE=2
+# Blazegraph HTTP User Agent for federation
+USER_AGENT="Wikidata Query Service; https://query.wikidata.org/;;
 
 echo "Running Blazegraph from `pwd` on :$PORT/$CONTEXT"
 java -server -XX:+UseG1GC ${MEMORY} ${DEBUG} ${GC_LOGS} \
@@ -61,6 +63,7 @@
  
-Dcom.bigdata.rdf.sail.webapp.client.RemoteRepository.maxRequestURLLength=7168 \
  
-Dcom.bigdata.rdf.sail.sparql.PrefixDeclProcessor.additionalDeclsFile=$DIR/prefixes.conf
 \
  
-Dcom.bigdata.rdf.sail.webapp.client.HttpClientConfigurator=org.wikidata.query.rdf.blazegraph.ProxiedHttpConnectionFactory
 \
+ -Dhttp.userAgent="${USER_AGENT}" \
  ${BLAZEGRAPH_OPTS} \
  -jar jetty-runner*.jar \
  --host $HOST \

-- 
To view, visit https://gerrit.wikimedia.org/r/346056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I156bcb753c214faa597895eba0050cf4a059aa26
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Lydia Pintscher 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add User-Agent string to the Query Service federation requests.

2017-04-02 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346056 )

Change subject: Add User-Agent string to the Query Service federation requests.
..

Add User-Agent string to the Query Service federation requests.

Change-Id: I156bcb753c214faa597895eba0050cf4a059aa26
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
M dist/src/script/runBlazegraph.sh
2 files changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/56/346056/1

diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
index a029aa3..e27b572 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/ProxiedHttpConnectionFactory.java
@@ -3,6 +3,8 @@
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpProxy;
 import org.eclipse.jetty.client.ProxyConfiguration;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpHeader;
 
 import com.bigdata.rdf.sail.webapp.client.DefaultHttpClientFactory;
 import com.bigdata.rdf.sail.webapp.client.IHttpClientFactory;
@@ -25,7 +27,10 @@
  * Configuration name for proxy port.
  */
 private static final String HTTP_PROXY_PORT = "http.proxyPort";
-
+/**
+ * Configuration name for User agent.
+ */
+private static final String HTTP_USER_AGENT = "http.userAgent";
 public ProxiedHttpConnectionFactory() {
 defaultFactory = new DefaultHttpClientFactory();
 }
@@ -44,6 +49,10 @@
 proxy.getExcludedAddresses().add("127.0.0.1");
 proxyConfig.getProxies().add(proxy);
 }
+final String userAgent = System.getProperty(HTTP_USER_AGENT);
+if (userAgent != null) {
+client.setUserAgentField(new HttpField(HttpHeader.USER_AGENT, 
userAgent));
+}
 
 return client;
 }
diff --git a/dist/src/script/runBlazegraph.sh b/dist/src/script/runBlazegraph.sh
index b923a15..3027837 100755
--- a/dist/src/script/runBlazegraph.sh
+++ b/dist/src/script/runBlazegraph.sh
@@ -49,6 +49,8 @@
 
 # Q-id of the default globe
 DEFAULT_GLOBE=2
+# Blazegraph HTTP User Agent for federation
+USER_AGENT="Wikidata Query Service; https://query.wikidata.org/;;
 
 echo "Running Blazegraph from `pwd` on :$PORT/$CONTEXT"
 java -server -XX:+UseG1GC ${MEMORY} ${DEBUG} ${GC_LOGS} \
@@ -61,6 +63,7 @@
  
-Dcom.bigdata.rdf.sail.webapp.client.RemoteRepository.maxRequestURLLength=7168 \
  
-Dcom.bigdata.rdf.sail.sparql.PrefixDeclProcessor.additionalDeclsFile=$DIR/prefixes.conf
 \
  
-Dcom.bigdata.rdf.sail.webapp.client.HttpClientConfigurator=org.wikidata.query.rdf.blazegraph.ProxiedHttpConnectionFactory
 \
+ -Dhttp.userAgent="${USER_AGENT}" \
  ${BLAZEGRAPH_OPTS} \
  -jar jetty-runner*.jar \
  --host $HOST \

-- 
To view, visit https://gerrit.wikimedia.org/r/346056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I156bcb753c214faa597895eba0050cf4a059aa26
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits