NNCPNOSYNC environment variable

[nncp.git] / src / toss.go

diff --git a/src/toss.go b/src/toss.go
index 4037831b59618319fdee6083127d91b83af21622..e383257db77c43e31ddd8127160276526376983e 100644 (file)
--- a/src/toss.go
+++ b/src/toss.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
 
 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
@@ -157,9 +157,12 @@ func jobProcess(
                        } else {
                                cmd.Stdin = pipeR
                        }
-                       output, err := cmd.Output()
+                       output, err := cmd.CombinedOutput()
                        if err != nil {
-                               ctx.LogE("rx-hande", les, err, func(les LEs) string {
+                               les = append(les, LE{"Output", strings.Split(
+                                       strings.Trim(string(output), "\n"), "\n"),
+                               })
+                               ctx.LogE("rx-handle", les, err, func(les LEs) string {
                                        return fmt.Sprintf(
                                                "Tossing exec %s/%s (%s): %s: handling",
                                                sender.Name, pktName,
@@ -326,16 +329,18 @@ func jobProcess(
                                })
                                return err
                        }
-                       if err = tmp.Sync(); err != nil {
-                               tmp.Close()
-                               ctx.LogE("rx-sync", les, err, func(les LEs) string {
-                                       return fmt.Sprintf(
-                                               "Tossing file %s/%s (%s): %s: syncing",
-                                               sender.Name, pktName,
-                                               humanize.IBytes(pktSize), dst,
-                                       )
-                               })
-                               return err
+                       if !NoSync {
+                               if err = tmp.Sync(); err != nil {
+                                       tmp.Close()
+                                       ctx.LogE("rx-sync", les, err, func(les LEs) string {
+                                               return fmt.Sprintf(
+                                                       "Tossing file %s/%s (%s): %s: syncing",
+                                                       sender.Name, pktName,
+                                                       humanize.IBytes(pktSize), dst,
+                                               )
+                                       })
+                                       return err
+                               }
                        }
                        if err = tmp.Close(); err != nil {
                                ctx.LogE("rx-close", les, err, func(les LEs) string {
@@ -616,11 +621,11 @@ func jobProcess(
                                if err != nil {
                                        panic(err)
                                }
-                               if _, err = ctx.Tx(
+                               if _, _, err = ctx.Tx(
                                        node,
                                        pktTrns,
                                        nice,
-                                       int64(pktSize), 0,
+                                       int64(pktSize), 0, MaxFileSize,
                                        pipeR,
                                        pktName,
                                        nil,
@@ -747,8 +752,14 @@ func jobProcess(
                                }
                                if nodeId != sender.Id && nodeId != pktEnc.Sender {
                                        ctx.LogI("rx-area-echo", lesEcho, logMsgNode)
-                                       if _, err = ctx.Tx(
-                                               node, &pkt, nice, int64(pktSize), 0, fullPipeR, pktName, nil,
+                                       if _, _, err = ctx.Tx(
+                                               node,
+                                               &pkt,
+                                               nice,
+                                               int64(pktSize), 0, MaxFileSize,
+                                               fullPipeR,
+                                               pktName,
+                                               nil,
                                        ); err != nil {
                                                ctx.LogE("rx-area", lesEcho, err, logMsgNode)
                                                return err
@@ -859,6 +870,7 @@ func jobProcess(
                                nil,
                        )
                        if err != nil {
+                               ctx.LogE("rx-area-pkt-enc-read2", les, err, logMsg)
                                pipeW.CloseWithError(err)
                                <-errs
                                return err