Add transfer logging output (#77)
Co-authored-by: Dane Everitt <dane@daneeveritt.com>
This commit is contained in:
@@ -45,6 +45,8 @@ var e = []string{
|
||||
server.InstallCompletedEvent,
|
||||
server.DaemonMessageEvent,
|
||||
server.BackupCompletedEvent,
|
||||
server.TransferLogsEvent,
|
||||
server.TransferStatusEvent,
|
||||
}
|
||||
|
||||
// Listens for different events happening on a server and sends them along
|
||||
|
||||
@@ -28,6 +28,7 @@ const (
|
||||
PermissionSendPowerRestart = "control.restart"
|
||||
PermissionReceiveErrors = "admin.websocket.errors"
|
||||
PermissionReceiveInstall = "admin.websocket.install"
|
||||
PermissionReceiveTransfer = "admin.websocket.transfer"
|
||||
PermissionReceiveBackups = "backup.read"
|
||||
)
|
||||
|
||||
@@ -149,6 +150,13 @@ func (h *Handler) SendJson(v *Message) error {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// If we are sending transfer output, only send it to the user if they have the required permissions.
|
||||
if v.Event == server.TransferLogsEvent {
|
||||
if !j.HasPermission(PermissionReceiveTransfer) {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if err := h.unsafeSendJson(v); err != nil {
|
||||
@@ -320,13 +328,15 @@ func (h *Handler) HandleInbound(m Message) error {
|
||||
// Only send the current disk usage if the server is offline, if docker container is running,
|
||||
// Environment#EnableResourcePolling() will send this data to all clients.
|
||||
if state == environment.ProcessOfflineState {
|
||||
_ = h.server.Filesystem().HasSpaceAvailable(false)
|
||||
if !h.server.IsInstalling() && !h.server.IsTransferring() {
|
||||
_ = h.server.Filesystem().HasSpaceAvailable(false)
|
||||
|
||||
b, _ := json.Marshal(h.server.Proc())
|
||||
h.SendJson(&Message{
|
||||
Event: server.StatsEvent,
|
||||
Args: []string{string(b)},
|
||||
})
|
||||
b, _ := json.Marshal(h.server.Proc())
|
||||
h.SendJson(&Message{
|
||||
Event: server.StatsEvent,
|
||||
Args: []string{string(b)},
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user