Attachment 878471 Details for Bug 1080458 – addtional patch moving timeout and retry to /etc/hwcert.xml

[patch] addtional patch moving timeout and retry to /etc/hwcert.xml

0002-1080458-Application-Error-32000-searching-for-certif.patch (text/plain), 4.87 KB, created by Greg Nichols on 2014-03-25 14:01:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-03-25 14:01:54 UTC

Size: 4.87 KB

patch

obsolete

>From bccf0524f10194444ce696fa6acbb2101de6830e Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Tue, 25 Mar 2014 09:59:28 -0400
>Subject: [PATCH 2/2] 1080458 - Application Error: 32000 searching for
> certification via hwcert-client 'hwcert'
>
>---
> hwcert/catalog.py     |  4 ++--
> hwcert/environment.py | 24 ++++++++++++++++++++----
> hwcert/tags.py        |  2 ++
> 3 files changed, 24 insertions(+), 6 deletions(-)
>
>diff --git a/hwcert/catalog.py b/hwcert/catalog.py
>index 5939985..6f27cc8 100644
>--- a/hwcert/catalog.py
>+++ b/hwcert/catalog.py
>@@ -272,8 +272,8 @@ class Catalog(Controller):
>         return False # don't retry
> 
>     def __search(self, parameters, thing):
>-        retries = 3
>-        timeout = 10 # seconds
>+        retries = self.environment.getCatalogSearchRetries()
>+        timeout = self.environment.getCatalogSearchTimeout() # seconds
>         sys.stdout.write("Searching...")
>         sys.stdout.flush()
>         id = 0
>diff --git a/hwcert/environment.py b/hwcert/environment.py
>index 8f14579..fecc48e 100644
>--- a/hwcert/environment.py
>+++ b/hwcert/environment.py
>@@ -51,6 +51,8 @@ class Environment(DocumentBase):
>         # set to partner's catalog for beta
>         self.defaultCatalogURL="https://hardware.redhat.com/xmlrpc.cgi"
>         # self.defaultCatalogURL="https://partner-hwcert.redhat.com/xmlrpc.cgi"
>+        self.defaultCatalogSearchTimeout = 10 # seconds
>+        self.defaultCatalogSearchRetries = 3
>         # outbound e-mail is disabled by default
>         self.defaultServerEMail = "" # hwcert-server@redhat.com
>         self.defaultServerSMTPHost = "" # localhost
>@@ -63,14 +65,14 @@ class Environment(DocumentBase):
>     
>     def new(self):
>         self._new(topElement=Tags.hwcert_environment, stylesheet="/hwcert/css/env.css")
>-        
>+
>         # set up defaults
>         filesystemElement = self.findOrCreateElement(self.document.documentElement, Tags.file_system)
>         filesystemElement.setAttribute(Attributes.maximum_attachment_size, "%u" % self.defaultMaximumAttachmentFileSize)
>         filesystemElement.setAttribute(Attributes.results_warning_size, "%u" % self.defaultResultsWarningSize)
>-        
>+
>         urlElement = self.findOrCreateElement(self.document.documentElement, Tags.urls)
>-        
>+
>         # data-directory
>         element = self.findOrCreateElement(filesystemElement, Tags.data_directory)
>         self.setTextNode(element, self.defaultDataDirectory)
>@@ -78,7 +80,7 @@ class Environment(DocumentBase):
>         element.setAttribute(Attributes.certification_name, self.defaultCertificationName)
>         element.setAttribute(Attributes.task_file, self.defaultTaskFile)
>         element.setAttribute(Attributes.lock_file, self.defaultLockFile)
>-        
>+
>         # server-directory
>         element = self.findOrCreateElement(filesystemElement, Tags.server_directory)
>         self.setTextNode(element, self.defaultServerDirectory)
>@@ -108,6 +110,8 @@ class Environment(DocumentBase):
>         self.setTextNode(element, self.defaultPartnerServerURL)
>         element = self.findOrCreateElement(urlElement, Tags.catalog_url)
>         self.setTextNode(element, self.defaultCatalogURL)
>+        element.setAttribute(Attributes.search_timeout, "%u" % self.defaultCatalogSearchTimeout)
>+        element.setAttribute(Attributes.search_retries, "%u" % self.defaultCatalogSearchRetries)
> 
>         timeLimitsElement = self.findOrCreateElement(self.document.documentElement, Tags.time_limits)
>         timeLimitsElement.setAttribute(Attributes.fv_guest_timelimit, "%u" % self.defaultFVGuestTimelimit)
>@@ -270,6 +274,18 @@ class Environment(DocumentBase):
>             return self.defaultCatalogURL
>         return self.getTextNode(element).data
> 
>+    def getCatalogSearchTimeout(self):
>+        catalogURLElement = self.findOrCreateElement(self._getURLsElement(), Tags.catalog_url)
>+        if not catalogURLElement.getAttribute(Attributes.search_timeout):
>+            return self.defaultCatalogSearchTimeout
>+        return string.atoi(catalogURLElement.getAttribute(Attributes.search_timeout))
>+
>+    def getCatalogSearchRetries(self):
>+        catalogURLElement = self.findOrCreateElement(self._getURLsElement(), Tags.catalog_url)
>+        if not catalogURLElement.getAttribute(Attributes.search_retries):
>+            return self.defaultCatalogSearchRetries
>+        return string.atoi(catalogURLElement.getAttribute(Attributes.search_retries))
>+
>     def getMaximumAttachmentSize(self):
>         return string.atoi(self._getFilesystemElement().getAttribute(Attributes.maximum_attachment_size))
> 
>diff --git a/hwcert/tags.py b/hwcert/tags.py
>index a9974f5..668db5b 100644
>--- a/hwcert/tags.py
>+++ b/hwcert/tags.py
>@@ -125,6 +125,8 @@ class Attributes:
>     from_address="from-address"
>     smtp_host="smtp-host"
>     specification_id="specification-id"
>+    search_timeout="search-timeout"
>+    search_retries="search-retries"
> 
> class Constants:
>     PASS="PASS"
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1080458: 878464 | 878471