chiark / gitweb /
~mdw / hippotat / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 94da3cc)
hippotatd: --ownsource-local etc. options
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 5 Apr 2017 13:01:45 +0000 (14:01 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 5 Apr 2017 13:01:45 +0000 (14:01 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
hippotatd patch | blob | blame | history

diff --git a/hippotatd b/hippotatd
index ec47c1ddee4118218c24a6cdcb528279beb9463b..0ef6369559c295b90d69e45aa78e0ce4129e7886 100755 (executable)
--- a/hippotatd
+++ b/hippotatd
@@ -242,16 +242,17 @@ class IphttpResource(NotStupidResource):
 
   def render_GET(self, request):
     log_debug(DBG.HTTP, 'GET request')
 
   def render_GET(self, request):
     log_debug(DBG.HTTP, 'GET request')
-    return ('''
-<html><body>
-hippotat
-<p>
-<a href="%s">source</a>
-(and that of dependency <a href="%s">packages</a>)
-available
-</body></html>
-'''
-            % tuple(self.hippotat_sources)).encode('utf-8')
+    s = '<html><body>hippotat\n'
+    (s0,s1) = self.hippotat_sources
+    if s0:
+      s += '<p><a href="%s">source</a>\n' % s0
+      if self.hippotat_sources[1]:
+        s += ('(and that of dependency <a href="%s">packages</a>)\n' % s1)
+      s += 'available'
+    else:
+      s += 'TESTING'
+    s += '</body></html>'
+    return s.encode('utf-8')
 
 def start_http():
   resource = IphttpResource()
 
 def start_http():
   resource = IphttpResource()
@@ -273,11 +274,13 @@ def start_http():
   ssp = SourceShipmentPreparer(td)
   ssp.logger = partial(log_debug, DBG.OWNSOURCE)
   if DBG.OWNSOURCE in debug_set: ssp.stream_debug = sys.stdout
   ssp = SourceShipmentPreparer(td)
   ssp.logger = partial(log_debug, DBG.OWNSOURCE)
   if DBG.OWNSOURCE in debug_set: ssp.stream_debug = sys.stdout
-  ssp.generate()
+  ssp.download_packages = opts.ownsource >= 2
+  if opts.ownsource >= 1: ssp.generate()
 
   for ix in (0,1):
     bn = ssp.output_names[ix]
     op = ssp.output_paths[ix]
 
   for ix in (0,1):
     bn = ssp.output_names[ix]
     op = ssp.output_paths[ix]
+    if op is None: continue
     resource.hippotat_sources[ix] = bn
     subresource =twisted.web.static.File(op)
     resource.putChild(bn.encode('utf-8'), subresource)
     resource.hippotat_sources[ix] = bn
     subresource =twisted.web.static.File(op)
     resource.putChild(bn.encode('utf-8'), subresource)
@@ -338,6 +341,18 @@ def catch_termination():
   for sig in (signal.SIGINT, signal.SIGTERM):
     signal.signal(sig, partial(signal_handler, sig.name))
 
   for sig in (signal.SIGINT, signal.SIGTERM):
     signal.signal(sig, partial(signal_handler, sig.name))
 
+optparser.add_option('--ownsource', default=2,
+                     action='store_const', dest='ownsource', const=2,
+                     help='source download fully enabled (default)')
+
+optparser.add_option('--ownsource-local',
+                     action='store_const', dest='ownsource', const=1,
+                     help='source download is local source code only')
+
+optparser.add_option('--no-ownsource',
+                     action='store_const', dest='ownsource', const=0,
+                     help='source download disabled (for testing only)')
+
 common_startup(process_cfg)
 catch_termination()
 ipif = start_ipif(c.ipif_command, (lambda p,s,d: route(p,"[ipif]",s,d)))
 common_startup(process_cfg)
 catch_termination()
 ipif = start_ipif(c.ipif_command, (lambda p,s,d: route(p,"[ipif]",s,d)))
Local modifications for Ian Jackson's `Asinine IP Over HTTP' proxy: https://www.chiark.greenend.org.uk/ucgi/~ian/git/hippotat.git/