debug = flag.Bool("debug", false, "Print debug messages")
version = flag.Bool("version", false, "Print version information")
warranty = flag.Bool("warranty", false, "Print warranty information")
+
+ autoToss = flag.Bool("autotoss", false, "Toss after call is finished")
+ autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create .seen files during tossing")
+ autoTossNoFile = flag.Bool("autotoss-nofile", false, "Do not process \"file\" packets during tossing")
+ autoTossNoFreq = flag.Bool("autotoss-nofreq", false, "Do not process \"freq\" packets during tossing")
+ autoTossNoExec = flag.Bool("autotoss-noexec", false, "Do not process \"exec\" packets during tossing")
+ autoTossNoTrns = flag.Bool("autotoss-notrns", false, "Do not process \"trns\" packets during tossing")
)
flag.Usage = usage
flag.Parse()
log.Fatalln("Invalid NODE specified:", err)
}
if len(node.Calls) == 0 {
- ctx.LogD("caller", nncp.LEs{{K: "Node", V: node.Id}}, "has no calls, skipping")
+ ctx.LogD(
+ "caller-no-calls",
+ nncp.LEs{{K: "Node", V: node.Id}},
+ func(les nncp.LEs) string {
+ return fmt.Sprintf("%s node has no calls, skipping", node.Name)
+ },
+ )
continue
}
nodes = append(nodes, node)
} else {
for _, node := range ctx.Neigh {
if len(node.Calls) == 0 {
- ctx.LogD("caller", nncp.LEs{{K: "Node", V: node.Id}}, "has no calls, skipping")
+ ctx.LogD(
+ "caller-no-calls",
+ nncp.LEs{{K: "Node", V: node.Id}},
+ func(les nncp.LEs) string {
+ return fmt.Sprintf("%s node has no calls, skipping", node.Name)
+ },
+ )
continue
}
nodes = append(nodes, node)
addrs = append(addrs, *call.Addr)
}
les := nncp.LEs{{K: "Node", V: node.Id}, {K: "CallIndex", V: i}}
+ logMsg := func(les nncp.LEs) string {
+ return fmt.Sprintf("%s node, call %d", node.Name, i)
+ }
for {
n := time.Now()
t := call.Cron.Next(n)
- ctx.LogD("caller", les, t.String())
+ ctx.LogD("caller-time", les, func(les nncp.LEs) string {
+ return logMsg(les) + ": " + t.String()
+ })
if t.IsZero() {
- ctx.LogE("caller", les, errors.New("got zero time"), "")
+ ctx.LogE("caller", les, errors.New("got zero time"), logMsg)
return
}
time.Sleep(t.Sub(n))
node.Lock()
if node.Busy {
node.Unlock()
- ctx.LogD("caller", les, "busy")
+ ctx.LogD("caller-busy", les, func(les nncp.LEs) string {
+ return logMsg(les) + ": busy"
+ })
continue
} else {
node.Busy = true
node.Unlock()
if call.WhenTxExists && call.Xx != "TRx" {
- ctx.LogD("caller", les, "checking tx existence")
+ ctx.LogD("caller", les, func(les nncp.LEs) string {
+ return logMsg(les) + ": checking tx existence"
+ })
txExists := false
for job := range ctx.Jobs(node.Id, nncp.TTx) {
if job.PktEnc.Nice > call.Nice {
txExists = true
}
if !txExists {
- ctx.LogD("caller", les, "no tx")
+ ctx.LogD("caller-no-tx", les, func(les nncp.LEs) string {
+ return logMsg(les) + ": no tx"
+ })
node.Lock()
node.Busy = false
node.Unlock()
var autoTossFinish chan struct{}
var autoTossBadCode chan bool
- if call.AutoToss {
+ if call.AutoToss || *autoToss {
autoTossFinish, autoTossBadCode = ctx.AutoToss(
node.Id,
call.Nice,
- call.AutoTossDoSeen,
- call.AutoTossNoFile,
- call.AutoTossNoFreq,
- call.AutoTossNoExec,
- call.AutoTossNoTrns,
+ call.AutoTossDoSeen || *autoTossDoSeen,
+ call.AutoTossNoFile || *autoTossNoFile,
+ call.AutoTossNoFreq || *autoTossNoFreq,
+ call.AutoTossNoExec || *autoTossNoExec,
+ call.AutoTossNoTrns || *autoTossNoTrns,
)
}
nil,
)
- if call.AutoToss {
+ if call.AutoToss || *autoToss {
close(autoTossFinish)
<-autoTossBadCode
}