server: remove redundant bypasswait file
Bypass requests are delivered via the event stream. The bypasswait file was unused.
This commit is contained in:
parent
b6d6d9e41e
commit
88062d0ed0
|
|
@ -483,31 +483,6 @@ func buildSessionChildren(
|
||||||
return s.ResolveBypass(id, approved)
|
return s.ResolveBypass(id, approved)
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
virtfs.FileNode("bypasswait", 0444,
|
|
||||||
virtfs.Doc("Blocks until a bypass request arrives."),
|
|
||||||
virtfs.Read(func() ([]byte, error) {
|
|
||||||
req := s.BypassPending()
|
|
||||||
if req == nil {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
data, err := json.Marshal(req)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return append(data, '\n'), nil
|
|
||||||
}),
|
|
||||||
virtfs.BlockOnce(func() ([]byte, string, error) {
|
|
||||||
req := s.BypassPending()
|
|
||||||
if req == nil {
|
|
||||||
return nil, "", nil
|
|
||||||
}
|
|
||||||
data, err := json.Marshal(req)
|
|
||||||
if err != nil {
|
|
||||||
return nil, "", err
|
|
||||||
}
|
|
||||||
return append(data, '\n'), req.ID, nil
|
|
||||||
}, s.BypassSignal),
|
|
||||||
),
|
|
||||||
virtfs.FileNode("stats", 0444,
|
virtfs.FileNode("stats", 0444,
|
||||||
virtfs.Read(func() ([]byte, error) {
|
virtfs.Read(func() ([]byte, error) {
|
||||||
a, err := metrics.AggregateSession(s.ID)
|
a, err := metrics.AggregateSession(s.ID)
|
||||||
|
|
|
||||||
|
|
@ -280,17 +280,6 @@ func (s *Session) BypassPending() *protocol.BypassRequest {
|
||||||
return s.bypassPending
|
return s.bypassPending
|
||||||
}
|
}
|
||||||
|
|
||||||
// BypassSignal returns a channel closed when the bypass state changes.
|
|
||||||
func (s *Session) BypassSignal() <-chan struct{} {
|
|
||||||
s.bypassMu.Lock()
|
|
||||||
if s.bypassSignalCh == nil {
|
|
||||||
s.bypassSignalCh = make(chan struct{})
|
|
||||||
}
|
|
||||||
ch := s.bypassSignalCh
|
|
||||||
s.bypassMu.Unlock()
|
|
||||||
return ch
|
|
||||||
}
|
|
||||||
|
|
||||||
// ResolveBypass resolves a pending bypass request and clears it.
|
// ResolveBypass resolves a pending bypass request and clears it.
|
||||||
func (s *Session) ResolveBypass(id string, approved bool) error {
|
func (s *Session) ResolveBypass(id string, approved bool) error {
|
||||||
s.bypassMu.Lock()
|
s.bypassMu.Lock()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue