From 820a31d25396f113eb248f8c6d8561adbfed1cb7 Mon Sep 17 00:00:00 2001 From: xSmurf Date: Wed, 8 Jul 2015 22:39:54 +0000 Subject: [PATCH] Added get config message --- oz-daemon/daemon.go | 11 +++++++++++ oz-daemon/protocol.go | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/oz-daemon/daemon.go b/oz-daemon/daemon.go index 23a2374..e259558 100644 --- a/oz-daemon/daemon.go +++ b/oz-daemon/daemon.go @@ -1,6 +1,7 @@ package daemon import ( + "encoding/json" "fmt" "os" "os/signal" @@ -33,6 +34,7 @@ func Main() { err := runServer( d.log, d.handlePing, + d.handleGetConfig, d.handleListProfiles, d.handleLaunch, d.handleListSandboxes, @@ -164,6 +166,15 @@ func (d *daemonState) handlePing(msg *PingMsg, m *ipc.Message) error { return m.Respond(&PingMsg{msg.Data}) } +func (d *daemonState) handleGetConfig(msg *GetConfigMsg, m *ipc.Message) error { + d.Debug("received get config with data [%s]", msg.Data) + jdata, err := json.Marshal(d.config) + if err != nil { + return m.Respond(&ErrorMsg{err.Error()}) + } + return m.Respond(&GetConfigMsg{string(jdata)}) +} + func (d *daemonState) handleListProfiles(msg *ListProfilesMsg, m *ipc.Message) error { r := new(ListProfilesResp) index := 1 diff --git a/oz-daemon/protocol.go b/oz-daemon/protocol.go index d8ce56b..d76fd79 100644 --- a/oz-daemon/protocol.go +++ b/oz-daemon/protocol.go @@ -16,6 +16,10 @@ type PingMsg struct { Data string "Ping" } +type GetConfigMsg struct { + Data string "GetConfig" +} + type ListProfilesMsg struct { _ string "ListProfiles" } @@ -83,6 +87,7 @@ var messageFactory = ipc.NewMsgFactory( new(PingMsg), new(OkMsg), new(ErrorMsg), + new(GetConfigMsg), new(ListProfilesMsg), new(ListProfilesResp), new(LaunchMsg),