safcm: move sync.sendRecv to frontend package

diff --git a/cmd/safcm/sync.go b/cmd/safcm/sync.go
index f1877cffde6b9b42b18955587192a19fda43127d..2f297c8dc69288aa4017f57d4e741562740784d9 100644 (file)
--- a/cmd/safcm/sync.go
+++ b/cmd/safcm/sync.go
@@ -44,6 +44,7 @@ type Sync struct {
 
        isTTY bool
 
 
        isTTY bool
 

+       loop    *frontend.Loop

        logFunc func(level safcm.LogLevel, escaped bool, msg string)
 }
 
        logFunc func(level safcm.LogLevel, escaped bool, msg string)
 }
 


@@ -119,10 +120,11 @@ func MainSync(args []string) error {
                        allHosts:  allHosts,
                        allGroups: allGroups,
                        isTTY:     isTTY,
                        allHosts:  allHosts,
                        allGroups: allGroups,
                        isTTY:     isTTY,

+                       loop:      loop,

                }
                s.logFunc = func(level safcm.LogLevel, escaped bool,
                        msg string) {
                }
                s.logFunc = func(level safcm.LogLevel, escaped bool,
                        msg string) {

-                       loop.Log(s, level, escaped, msg)
+                       s.loop.Log(s, level, escaped, msg)

                }
                hosts = append(hosts, s)
        }
                }
                hosts = append(hosts, s)
        }


@@ -319,25 +321,3 @@ func (s *Sync) logDebugf(format string, a ...interface{}) {
 func (s *Sync) logVerbosef(format string, a ...interface{}) {
        s.log(safcm.LogVerbose, false, fmt.Sprintf(format, a...))
 }
 func (s *Sync) logVerbosef(format string, a ...interface{}) {
        s.log(safcm.LogVerbose, false, fmt.Sprintf(format, a...))
 }

-
-// sendRecv sends a message over conn and waits for the response. Any MsgLog
-// messages received before the final (non MsgLog) response are passed to
-// s.log.
-func (s *Sync) sendRecv(conn *rpc.Conn, msg safcm.Msg) (safcm.Msg, error) {
-       err := conn.Send(msg)
-       if err != nil {
-               return nil, err
-       }
-       for {
-               x, err := conn.Recv()
-               if err != nil {
-                       return nil, err
-               }
-               log, ok := x.(safcm.MsgLog)
-               if ok {
-                       s.log(log.Level, false, log.Text)
-                       continue
-               }
-               return x, nil
-       }
-}

diff --git a/cmd/safcm/sync_info.go b/cmd/safcm/sync_info.go
index fd480063629a67e5f1c1c8d103ee1b19107fae88..91878e8ea1e109165e42006f78e18089e60d77fe 100644 (file)
--- a/cmd/safcm/sync_info.go
+++ b/cmd/safcm/sync_info.go
@@ -28,7 +28,7 @@ import (
 )
 
 func (s *Sync) hostInfo(conn *rpc.Conn) ([]string, error) {
 )
 
 func (s *Sync) hostInfo(conn *rpc.Conn) ([]string, error) {

-       x, err := s.sendRecv(conn, safcm.MsgInfoReq{
+       x, err := s.loop.SendRecv(s, conn, safcm.MsgInfoReq{

                LogLevel:     s.config.LogLevel,
                DetectGroups: s.config.DetectGroups,
        })
                LogLevel:     s.config.LogLevel,
                DetectGroups: s.config.DetectGroups,
        })

diff --git a/cmd/safcm/sync_sync.go b/cmd/safcm/sync_sync.go
index 7e4d225705eb46dae48c851d033d7364d4eff8cf..bc11043299e77152483fac038fa59d3b829b301a 100644 (file)
--- a/cmd/safcm/sync_sync.go
+++ b/cmd/safcm/sync_sync.go
@@ -35,7 +35,7 @@ func (s *Sync) hostSync(conn *rpc.Conn, detectedGroups []string) error {
        if err != nil {
                return err
        }
        if err != nil {
                return err
        }

-       x, err := s.sendRecv(conn, req)
+       x, err := s.loop.SendRecv(s, conn, req)

        if err != nil {
                return err
        }
        if err != nil {
                return err
        }

diff --git a/frontend/conn.go b/frontend/conn.go
new file mode 100644 (file)
index 0000000..10f7c7b
--- /dev/null
+++ b/frontend/conn.go
@@ -0,0 +1,47 @@
+// Frontend: Connection functions for programs using the safcm library
+
+// Copyright (C) 2021  Simon Ruderich
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package frontend
+
+import (
+       "ruderich.org/simon/safcm"
+       "ruderich.org/simon/safcm/rpc"
+)
+
+// SendRecv sends a message for host over conn and waits for the response. Any
+// MsgLog messages received before the final (non MsgLog) response are passed
+// to l.Log.
+func (l *Loop) SendRecv(host Host, conn *rpc.Conn, msg safcm.Msg) (
+       safcm.Msg, error) {
+
+       err := conn.Send(msg)
+       if err != nil {
+               return nil, err
+       }
+       for {
+               x, err := conn.Recv()
+               if err != nil {
+                       return nil, err
+               }
+               log, ok := x.(safcm.MsgLog)
+               if ok {
+                       l.Log(host, log.Level, false, log.Text)
+                       continue
+               }
+               return x, nil
+       }
+}