Don't try to close the protobuf server if it's not open

Fix #584
influxdata · Nov 5, 2014 · 1f35705 · 1f35705
1 parent d14c148
commit 1f35705
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@
 
 ### Bugfixes
 
+- [Issue #584](https://github.com/influxdb/influxdb/issues/584). Don't
+  panic if the process died while initializing
 - [Issue #800](https://github.com/influxdb/influxdb/issues/800). Use
   su instead of sudo in the init script. This fixes the startup problem
   on RHEL 6.

diff --git a/coordinator/protobuf_server.go b/coordinator/protobuf_server.go
@@ -31,6 +31,10 @@ func NewProtobufServer(port string, requestHandler Handler) *ProtobufServer {
 }
 
 func (self *ProtobufServer) Close() {
+	if self.listener == nil {
+		return
+	}
+
 	self.listener.Close()
 	self.connectionMapLock.Lock()
 	defer self.connectionMapLock.Unlock()