[lxc-devel] [lxd/master] use our custom http server when updating HTTPS address too

[tych0 on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 361 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161220/316d524d/attachment.bin>
-------------- next part --------------
From 75d6f47bb5b06c0c6f128aa2740f8064175b012b Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho.andersen at canonical.com>
Date: Tue, 20 Dec 2016 12:12:09 -0700
Subject: [PATCH] use our custom http server when updating HTTPS address too

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
---
 lxd/daemon.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/daemon.go b/lxd/daemon.go
index 2414cc0..80c39da 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -524,7 +524,7 @@ func (d *Daemon) UpdateHTTPsPort(newAddress string) error {
 			return fmt.Errorf("cannot listen on https socket: %v", err)
 		}
 
-		d.tomb.Go(func() error { return http.Serve(tcpl, d.mux) })
+		d.tomb.Go(func() error { return http.Serve(tcpl, &lxdHttpServer{d.mux, d}) })
 		d.TCPSocket = &Socket{Socket: tcpl, CloseOnExit: true}
 	}