From 28454d6fb712d69e299660bef098be0be45c9475 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 2 Oct 2020 11:38:35 +0100 Subject: [PATCH 1/2] Log origin in /send --- federationapi/routing/send.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go index d4bbe31c6..e2ab9b334 100644 --- a/federationapi/routing/send.go +++ b/federationapi/routing/send.go @@ -81,7 +81,7 @@ func Send( t.TransactionID = txnID t.Destination = cfg.Matrix.ServerName - util.GetLogger(httpReq.Context()).Infof("Received transaction %q containing %d PDUs, %d EDUs", txnID, len(t.PDUs), len(t.EDUs)) + util.GetLogger(httpReq.Context()).Infof("Received transaction %q from %q containing %d PDUs, %d EDUs", txnID, request.Origin(), len(t.PDUs), len(t.EDUs)) resp, jsonErr := t.processTransaction(httpReq.Context()) if jsonErr != nil { From 1b29e5771feb335afe0e39e7f33f1d1896dbdb2f Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 2 Oct 2020 11:49:13 +0100 Subject: [PATCH 2/2] Fix build.sh --- build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f790077e3..31e0519f5 100755 --- a/build.sh +++ b/build.sh @@ -7,7 +7,10 @@ if [ -d ".git" ] then export BUILD=`git rev-parse --short HEAD || ""` export BRANCH=`(git symbolic-ref --short HEAD | tr -d \/ ) || ""` - [[ $BRANCH == "master" ]] && export BRANCH="" + if [[ $BRANCH == "master" ]] + then + export BRANCH="" + fi export FLAGS="-X github.com/matrix-org/dendrite/internal.branch=$BRANCH -X github.com/matrix-org/dendrite/internal.build=$BUILD" else