More changes related to running on new kiosk.house.

[kiosk.git] / generic_news_rss_renderer.py

diff --git a/generic_news_rss_renderer.py b/generic_news_rss_renderer.py
index e6d45335e47f87750fd17441f5f1d11af78065c9..149f8acb3aa9f163d195d42deec8e82b442da34f 100644 (file)
--- a/generic_news_rss_renderer.py
+++ b/generic_news_rss_renderer.py
@@ -6,6 +6,8 @@ from dateutil.parser import parse
 import http.client
 import random
 import re
+import sys
+import traceback
 from typing import Dict, List, Optional, Union
 import xml.etree.ElementTree as ET
 
@@ -209,10 +211,10 @@ class generic_news_rss_renderer(renderer.debuggable_abstaining_renderer):
         for uri in self.feed_uris:
             if self.should_use_https():
                 self.debug_print("Fetching: https://%s%s" % (self.feed_site, uri))
-                self.conn = http.client.HTTPSConnection(self.feed_site, timeout=20)
+                self.conn = http.client.HTTPSConnection(self.feed_site, timeout=10)
             else:
                 self.debug_print("Fetching: http://%s%s" % (self.feed_site, uri))
-                self.conn = http.client.HTTPConnection(self.feed_site, timeout=20)
+                self.conn = http.client.HTTPConnection(self.feed_site, timeout=10)
             assert(self.conn is not None)
             self.conn.request(
                 "GET",
@@ -220,8 +222,8 @@ class generic_news_rss_renderer(renderer.debuggable_abstaining_renderer):
                 None,
                 {
                     "Accept": "*/*",
-                    "Cache-control": "max-age=59",
-                    "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36",
+#                    "Cache-control": "max-age=50",
+#                    "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.93 Safari/537.36",
                 },
             )
             try: