From a39a8460698eb8d1e4804fd7c17958fc34f29b42 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Mon, 16 May 2016 21:34:36 +0200
Subject: [PATCH] quick patch to develop_tmsp, separating the config files;
 this is needed to avoid edb to assume that tendermints written config file is
 edbs config file the current code is highly unsafe as a differently
 structured config file will produce a runtime error

---
 erisdb/serve.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erisdb/serve.go b/erisdb/serve.go
index 2ba25813..bfd63b1b 100644
--- a/erisdb/serve.go
+++ b/erisdb/serve.go
@@ -67,7 +67,7 @@ func ServeErisDB(workDir string, inProc bool) (*server.ServeProcess, error) {
 
 	// Get an erisdb configuration
 	var edbConf *edbcfg.ErisDBConfig
-	edbConfPath := path.Join(workDir, "config.toml")
+	edbConfPath := path.Join(workDir, "server_config.toml")
 	if !FileExists(edbConfPath) {
 		log.Info("No server configuration, using default.")
 		log.Info("Writing to: " + edbConfPath)
-- 
GitLab