"errors"
"fmt"
"github.com/go-playground/validator/v10"
- "go.uber.org/zap"
"golang.org/x/text/encoding/charmap"
"gopkg.in/yaml.v3"
"io"
"io/fs"
+ "log"
+ "log/slog"
"math/big"
"math/rand"
"net"
Config *Config
ConfigDir string
- Logger *zap.SugaredLogger
+ Logger *slog.Logger
banner []byte
PrivateChatsMu sync.Mutex
}
func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {
- s.Logger.Infow("Hotline server started",
+ s.Logger.Info("Hotline server started",
"version", VERSION,
"API port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port),
"Transfer port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port+1),
go func() {
ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", s.NetInterface, s.Port))
if err != nil {
- s.Logger.Fatal(err)
+ log.Fatal(err)
}
- s.Logger.Fatal(s.Serve(ctx, ln))
+ log.Fatal(s.Serve(ctx, ln))
}()
wg.Add(1)
go func() {
ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", s.NetInterface, s.Port+1))
if err != nil {
- s.Logger.Fatal(err)
+ log.Fatal(err)
}
- s.Logger.Fatal(s.ServeFileTransfers(ctx, ln))
+ log.Fatal(s.ServeFileTransfers(ctx, ln))
}()
wg.Wait()
)
if err != nil {
- s.Logger.Errorw("file transfer error", "reason", err)
+ s.Logger.Error("file transfer error", "reason", err)
}
}()
}
t := <-s.outbox
go func() {
if err := s.sendTransaction(t); err != nil {
- s.Logger.Errorw("error sending transaction", "err", err)
+ s.Logger.Error("error sending transaction", "err", err)
}
}()
}
for {
conn, err := ln.Accept()
if err != nil {
- s.Logger.Errorw("error accepting connection", "err", err)
+ s.Logger.Error("error accepting connection", "err", err)
}
connCtx := context.WithValue(ctx, contextKeyReq, requestCtx{
remoteAddr: conn.RemoteAddr().String(),
})
go func() {
- s.Logger.Infow("Connection established", "RemoteAddr", conn.RemoteAddr())
+ s.Logger.Info("Connection established", "RemoteAddr", conn.RemoteAddr())
defer conn.Close()
if err := s.handleNewConnection(connCtx, conn, conn.RemoteAddr().String()); err != nil {
if err == io.EOF {
- s.Logger.Infow("Client disconnected", "RemoteAddr", conn.RemoteAddr())
+ s.Logger.Info("Client disconnected", "RemoteAddr", conn.RemoteAddr())
} else {
- s.Logger.Errorw("error serving request", "RemoteAddr", conn.RemoteAddr(), "err", err)
+ s.Logger.Error("error serving request", "RemoteAddr", conn.RemoteAddr(), "err", err)
}
}
}()
)
// NewServer constructs a new Server from a config dir
-func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredLogger, fs FileStore) (*Server, error) {
+func NewServer(configDir, netInterface string, netPort int, logger *slog.Logger, fs FileStore) (*Server, error) {
server := Server{
NetInterface: netInterface,
Port: netPort,
*server.NextGuestID = 1
if server.Config.EnableTrackerRegistration {
- server.Logger.Infow(
+ server.Logger.Info(
"Tracker registration enabled",
"frequency", fmt.Sprintf("%vs", trackerUpdateFrequency),
"trackers", server.Config.Trackers,
binary.BigEndian.PutUint16(tr.Port[:], uint16(server.Port))
for _, t := range server.Config.Trackers {
if err := register(t, tr); err != nil {
- server.Logger.Errorw("unable to register with tracker %v", "error", err)
+ server.Logger.Error("unable to register with tracker %v", "error", err)
}
- server.Logger.Debugw("Sent Tracker registration", "addr", t)
+ server.Logger.Debug("Sent Tracker registration", "addr", t)
}
time.Sleep(trackerUpdateFrequency * time.Second)
return err
}
- c.logger.Infow("Login failed", "clientVersion", fmt.Sprintf("%x", c.Version))
+ c.logger.Info("Login failed", "clientVersion", fmt.Sprintf("%x", c.Version))
return nil
}
// part of TranAgreed
c.logger = c.logger.With("name", string(c.UserName))
- c.logger.Infow("Login successful", "clientVersion", "Not sent (probably 1.2.3)")
+ c.logger.Info("Login successful", "clientVersion", "Not sent (probably 1.2.3)")
// Notify other clients on the server that the new user has logged in. For 1.5+ clients we don't have this
// information yet, so we do it in TranAgreed instead
}
if err := c.handleTransaction(t); err != nil {
- c.logger.Errorw("Error handling transaction", "err", err)
+ c.logger.Error("Error handling transaction", "err", err)
}
}
return nil
return err
}
- rLogger.Infow("File download started", "filePath", fullPath)
+ rLogger.Info("File download started", "filePath", fullPath)
// if file transfer options are included, that means this is a "quick preview" request from a 1.5+ client
if fileTransfer.options == nil {
return err
}
- rLogger.Infow("File upload started", "dstFile", fullPath)
+ rLogger.Info("File upload started", "dstFile", fullPath)
rForkWriter := io.Discard
iForkWriter := io.Discard
}
if err := receiveFile(rwc, file, rForkWriter, iForkWriter, fileTransfer.bytesSentCounter); err != nil {
- s.Logger.Error(err)
+ s.Logger.Error(err.Error())
}
if err := file.Close(); err != nil {
return err
}
- rLogger.Infow("File upload complete", "dstFile", fullPath)
+ rLogger.Info("File upload complete", "dstFile", fullPath)
case FolderDownload:
s.Stats.DownloadCounter += 1
basePathLen := len(fullPath)
- rLogger.Infow("Start folder download", "path", fullPath)
+ rLogger.Info("Start folder download", "path", fullPath)
nextAction := make([]byte, 2)
if _, err := io.ReadFull(rwc, nextAction); err != nil {
}
subPath := path[basePathLen+1:]
- rLogger.Debugw("Sending fileheader", "i", i, "path", path, "fullFilePath", fullPath, "subPath", subPath, "IsDir", info.IsDir())
+ rLogger.Debug("Sending fileheader", "i", i, "path", path, "fullFilePath", fullPath, "subPath", subPath, "IsDir", info.IsDir())
if i == 1 {
return nil
return err
}
- rLogger.Debugw("Client folder download action", "action", fmt.Sprintf("%X", nextAction[0:2]))
+ rLogger.Debug("Client folder download action", "action", fmt.Sprintf("%X", nextAction[0:2]))
var dataOffset int64
return nil
}
- rLogger.Infow("File download started",
+ rLogger.Info("File download started",
"fileName", info.Name(),
"TransferSize", fmt.Sprintf("%x", hlFile.ffo.TransferSize(dataOffset)),
)
// Send file size to client
if _, err := rwc.Write(hlFile.ffo.TransferSize(dataOffset)); err != nil {
- s.Logger.Error(err)
+ s.Logger.Error(err.Error())
return err
}
s.Stats.UploadCounter += 1
s.Stats.UploadsInProgress += 1
defer func() { s.Stats.UploadsInProgress -= 1 }()
- rLogger.Infow(
+ rLogger.Info(
"Folder upload started",
"dstPath", fullPath,
"TransferSize", binary.BigEndian.Uint32(fileTransfer.TransferSize),
return err
}
- rLogger.Infow(
+ rLogger.Info(
"Folder upload continued",
"FormattedPath", fu.FormattedPath(),
"IsFolder", fmt.Sprintf("%x", fu.IsFolder),
}
if err := receiveFile(rwc, file, io.Discard, io.Discard, fileTransfer.bytesSentCounter); err != nil {
- s.Logger.Error(err)
+ s.Logger.Error(err.Error())
}
err = os.Rename(fullPath+"/"+fu.FormattedPath()+".incomplete", fullPath+"/"+fu.FormattedPath())
return err
}
- rLogger.Infow("Starting file transfer", "path", filePath, "fileNum", i+1, "fileSize", binary.BigEndian.Uint32(fileSize))
+ rLogger.Info("Starting file transfer", "path", filePath, "fileNum", i+1, "fileSize", binary.BigEndian.Uint32(fileSize))
incWriter, err := hlFile.incFileWriter()
if err != nil {
}
}
}
- rLogger.Infof("Folder upload complete")
+ rLogger.Info("Folder upload complete")
}
return nil
git.r.bdr.sh / rbdr / mobius / blobdiff