|
 |
b4545b |
From 0cb9637f1962ad6be9e977b4b971b823af407c2d Mon Sep 17 00:00:00 2001
|
|
|
b4545b |
From: Tomas Jelinek <tojeline@redhat.com>
|
|
|
b4545b |
Date: Thu, 14 May 2020 16:42:32 +0200
|
|
|
b4545b |
Subject: [PATCH 3/3] fix ruby daemon closing connection after 30s
|
|
|
b4545b |
|
|
|
b4545b |
---
|
|
|
b4545b |
pcs/daemon/ruby_pcsd.py | 2 +-
|
|
|
b4545b |
pcsd/rserver.rb | 2 +-
|
|
|
b4545b |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
b4545b |
|
|
|
b4545b |
diff --git a/pcs/daemon/ruby_pcsd.py b/pcs/daemon/ruby_pcsd.py
|
|
|
b4545b |
index 53c53eaf..b640752d 100644
|
|
|
b4545b |
--- a/pcs/daemon/ruby_pcsd.py
|
|
|
b4545b |
+++ b/pcs/daemon/ruby_pcsd.py
|
|
|
b4545b |
@@ -127,7 +127,7 @@ class Wrapper:
|
|
|
b4545b |
|
|
|
b4545b |
def prepare_curl_callback(self, curl):
|
|
|
b4545b |
curl.setopt(pycurl.UNIX_SOCKET_PATH, self.__pcsd_ruby_socket)
|
|
|
b4545b |
- curl.setopt(pycurl.TIMEOUT, 70)
|
|
|
b4545b |
+ curl.setopt(pycurl.TIMEOUT, 0)
|
|
|
b4545b |
|
|
|
b4545b |
async def send_to_ruby(self, request: RubyDaemonRequest):
|
|
|
b4545b |
try:
|
|
|
b4545b |
diff --git a/pcsd/rserver.rb b/pcsd/rserver.rb
|
|
|
b4545b |
index 4b58f252..08eceb79 100644
|
|
|
b4545b |
--- a/pcsd/rserver.rb
|
|
|
b4545b |
+++ b/pcsd/rserver.rb
|
|
|
b4545b |
@@ -63,7 +63,7 @@ use TornadoCommunicationMiddleware
|
|
|
b4545b |
require 'pcsd'
|
|
|
b4545b |
|
|
|
b4545b |
::Rack::Handler.get('thin').run(Sinatra::Application, {
|
|
|
b4545b |
- :Host => PCSD_RUBY_SOCKET,
|
|
|
b4545b |
+ :Host => PCSD_RUBY_SOCKET, :timeout => 0
|
|
|
b4545b |
}) do |server|
|
|
|
b4545b |
puts server.class
|
|
|
b4545b |
server.threaded = true
|
|
|
b4545b |
--
|
|
|
b4545b |
2.25.4
|
|
|
b4545b |
|