Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195219
Change subject: Tools: Remove tools-webproxy from list of proxies
......................................................................
Tools: Remove tools-webproxy from list of proxies
The instance tools-webproxy was deleted, but not removed from the list
of proxies webservices register with. This leads to webservices
timing out trying to contact the instance no longer existing.
Bug: T91939
Change-Id: Ibefaece9ff41693ef1e3541eb57696056d5c166e
---
M modules/toollabs/files/portgrabber
M modules/toollabs/files/tool-nodejs
M modules/toollabs/files/tool-uwsgi-python
3 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/195219/1
diff --git a/modules/toollabs/files/portgrabber
b/modules/toollabs/files/portgrabber
index a0df2d2..a5fafa7 100755
--- a/modules/toollabs/files/portgrabber
+++ b/modules/toollabs/files/portgrabber
@@ -29,10 +29,6 @@
my $host = `hostname`;
chomp $host;
-socket(PROXY, PF_INET, SOCK_STREAM, getprotobyname('tcp')) and
- connect(PROXY, sockaddr_in(8282, inet_aton('tools-webproxy'))) and
- syswrite PROXY, ".*\nhttp://$host:$port\n";;
-
socket(PROXY1, PF_INET, SOCK_STREAM, getprotobyname('tcp')) and
connect(PROXY1, sockaddr_in(8282, inet_aton('tools-webproxy-01'))) and
syswrite PROXY1, ".*\nhttp://$host:$port\n";;
diff --git a/modules/toollabs/files/tool-nodejs
b/modules/toollabs/files/tool-nodejs
index fe8dfdc..e8c0088 100644
--- a/modules/toollabs/files/tool-nodejs
+++ b/modules/toollabs/files/tool-nodejs
@@ -12,7 +12,7 @@
PORT = os.getuid()
-proxies = ('tools-webproxy', 'tools-webproxy-01', 'tools-webproxy-02')
+proxies = ('tools-webproxy-01', 'tools-webproxy-02')
socks = []
for proxy in proxies:
diff --git a/modules/toollabs/files/tool-uwsgi-python
b/modules/toollabs/files/tool-uwsgi-python
index 2498136..d001578 100755
--- a/modules/toollabs/files/tool-uwsgi-python
+++ b/modules/toollabs/files/tool-uwsgi-python
@@ -30,7 +30,7 @@
if os.path.exists(os.path.expanduser('~/www/python/uwsgi.ini')):
args += ['--ini', os.path.expanduser('~/www/python/uwsgi.ini')]
-proxies = ('tools-webproxy', 'tools-webproxy-01', 'tools-webproxy-02')
+proxies = ('tools-webproxy-01', 'tools-webproxy-02')
socks = []
for proxy in proxies:
--
To view, visit https://gerrit.wikimedia.org/r/195219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibefaece9ff41693ef1e3541eb57696056d5c166e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
