From a8482a8b8966a9ca7da991f3d9cd0282808ee5ac Mon Sep 17 00:00:00 2001 From: Vishal Date: Thu, 29 Mar 2018 15:26:47 +0530 Subject: [PATCH] Function logs: Uses proper way to get server URL After changes related to port forwarding, function logs was getting empty URL, fixed to use the appropriate method instead. --- fission/function.go | 4 ++-- fission/logdb/influxdb.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fission/function.go b/fission/function.go index d1fa7e75..75c28103 100644 --- a/fission/function.go +++ b/fission/function.go @@ -599,7 +599,7 @@ func fnLogs(c *cli.Context) error { checkErr(err, "get function") // request the controller to establish a proxy server to the database. - logDB, err := logdb.GetLogDB(dbType, c.GlobalString("server")) + logDB, err := logdb.GetLogDB(dbType, getServerUrl()) if err != nil { fatal("failed to connect log database") } @@ -671,7 +671,7 @@ func fnPods(c *cli.Context) error { // client first sends db query to the controller, then the controller // will establish a proxy server that bridges the client and the database. - logDB, err := logdb.GetLogDB(dbType, c.GlobalString("server")) + logDB, err := logdb.GetLogDB(dbType, getServerUrl()) if err != nil { fatal("failed to connect log database") } diff --git a/fission/logdb/influxdb.go b/fission/logdb/influxdb.go index 6adb2541..4b4936e1 100644 --- a/fission/logdb/influxdb.go +++ b/fission/logdb/influxdb.go @@ -98,7 +98,7 @@ func (influx InfluxDB) GetLogs(filter LogFilter) ([]LogEntry, error) { logEntries := []LogEntry{} response, err := influx.query(query) if err != nil { - return logEntries, nil + return logEntries, err } for _, r := range response.Results { for _, series := range r.Series {