Skip to content

Commit 55aee00

Browse files
samaaronsamaaron
committed
Tau - remove newline from end of log lines
This appears to now be added by default via the Erlang logger
1 parent 5607ab0 commit 55aee00

File tree

6 files changed

+69
-69
lines changed

6 files changed

+69
-69
lines changed

‎app/server/beam/tau/src/tau_server/tau_keepalive.erl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ start(DaemonPortNum) ->
2020
spawn(?MODULE, init, [DaemonPortNum]).
2121

2222
init(DaemonPortNum) ->
23-
logger:info("connecting to Daemon via TCP...~n", []),
23+
logger:info("connecting to Daemon via TCP...", []),
2424
{ok, DaemonSocket} = gen_tcp:connect({127,0,0,1}, DaemonPortNum, [
2525
binary,
2626
{active, true},
@@ -29,7 +29,7 @@ init(DaemonPortNum) ->
2929
]),
3030
OSPid = os:getpid(),
3131
PidMsg = osc:encode(["/tau_pid", OSPid]),
32-
logger:info("Sending Pid ~p to Daemon...~n", [OSPid]),
32+
logger:info("Sending Pid ~p to Daemon...", [OSPid]),
3333
gen_tcp:send(DaemonSocket, PidMsg),
3434
KillSwitch = erlang:start_timer(5000, self(), trigger_kill_switch),
3535
logger:info("Waiting for keepalive messages..."),
@@ -40,23 +40,23 @@ loop(KillSwitch) ->
4040
{tcp, _Socket, Bin} ->
4141
try osc:decode(Bin) of
4242
{cmd, ["/system/keepalive"]} ->
43-
logger:debug("Received keepalive message from Daemon ~n", []),
43+
logger:debug("Received keepalive message from Daemon", []),
4444
erlang:cancel_timer(KillSwitch),
4545
NewKillSwitch = erlang:start_timer(5000, self(), trigger_kill_switch),
4646
?MODULE:loop(NewKillSwitch);
4747
Other ->
48-
logger:error("Unexpected message from Daemon:~p~n", [Other]),
48+
logger:error("Unexpected message from Daemon:~p", [Other]),
4949
?MODULE:loop(KillSwitch)
5050
catch
5151
Class:Term:Trace ->
52-
logger:error("keepalive process: Error decoding OSC: ~p~n~p:~p~n~p~n",
52+
logger:error("keepalive process: Error decoding OSC: ~p~n~p:~p~n~p",
5353
[Bin, Class, Term, Trace]),
5454
?MODULE:loop(KillSwitch)
5555
end;
5656
{timeout, _Timer, trigger_kill_switch} ->
5757
logger:info("Tau kill switch activated. Shutting down....", []),
5858
init:stop();
5959
Any ->
60-
logger:error("Tau keepalive received unexpected message: ~p~n", [Any]),
60+
logger:error("Tau keepalive received unexpected message: ~p", [Any]),
6161
?MODULE:loop(KillSwitch)
6262
end.

‎app/server/beam/tau/src/tau_server/tau_server_api.erl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ init(Parent, CueServer, MIDIServer, LinkServer) ->
9595

9696

9797

98-
logger:debug("listening for API commands on socket: ~p~n",
98+
logger:debug("listening for API commands on socket: ~p",
9999
[try erlang:port_info(APISocket) catch _:_ -> undefined end]),
100100
State = #{parent => Parent,
101101
api_socket => APISocket,
@@ -110,7 +110,7 @@ init(Parent, CueServer, MIDIServer, LinkServer) ->
110110
loop(State) ->
111111
receive
112112
{tcp, Socket, Data} ->
113-
logger:debug("api server got TCP on ~p:~p~n", [Socket, Data]),
113+
logger:debug("api server got TCP on ~p:~p", [Socket, Data]),
114114
?MODULE:loop(State);
115115

116116
{timeout, Timer, {call, Server, Msg, Tracker}} ->
@@ -119,10 +119,10 @@ loop(State) ->
119119
?MODULE:loop(State);
120120

121121
{udp, APISocket, Ip, Port, Bin} ->
122-
logger:debug("api server got UDP on ~p:~p~n", [Ip, Port]),
122+
logger:debug("api server got UDP on ~p:~p", [Ip, Port]),
123123
case osc:decode(Bin) of
124124
{cmd, ["/ping"]} ->
125-
logger:debug("sending! /pong to ~p ~p ~n", [Ip, Port]),
125+
logger:debug("sending! /pong to ~p ~p ", [Ip, Port]),
126126
PongBin = osc:encode(["/pong"]),
127127
ok = gen_udp:send(APISocket, Ip, Port, PongBin),
128128
?MODULE:loop(State);
@@ -131,7 +131,7 @@ loop(State) ->
131131
?MODULE:loop(State);
132132

133133
{bundle, Time, X} ->
134-
logger:debug("got bundle for time ~f~n", [Time]),
134+
logger:debug("got bundle for time ~f", [Time]),
135135
NewState = do_bundle(Time, X, State),
136136
?MODULE:loop(NewState);
137137

@@ -214,7 +214,7 @@ loop(State) ->
214214
?MODULE:loop(State);
215215

216216
{cmd, Cmd} ->
217-
logger:error("Unknown OSC command:: ~p~n", [Cmd]),
217+
logger:error("Unknown OSC command:: ~p", [Cmd]),
218218
?MODULE:loop(State);
219219

220220
{system, From, Request} ->
@@ -223,7 +223,7 @@ loop(State) ->
223223
maps:get(parent, State),
224224
?MODULE, [], State);
225225
Any ->
226-
logger:error("API Server got unexpected message: ~p~n", [Any]),
226+
logger:error("API Server got unexpected message: ~p", [Any]),
227227
?MODULE:loop(State)
228228
end.
229229

@@ -239,7 +239,7 @@ send_to_cue(Message, State) ->
239239
ok.
240240

241241
debug_cmd([Cmd|Args]) ->
242-
logger:debug("command: ~s ~p~n", [Cmd, Args]).
242+
logger:debug("command: ~s ~p", [Cmd, Args]).
243243

244244
do_bundle(Time, [{_,Bin}|T], State) ->
245245
NewState =
@@ -257,11 +257,11 @@ do_bundle(Time, [{_,Bin}|T], State) ->
257257
{cmd, ["/link-set-tempo-tagged", Tag, Tempo]} ->
258258
schedule_link(Time, Tag, State, {link_set_tempo, Tempo});
259259
Other ->
260-
logger:error("Unexpected bundle content:~p~n", [Other]),
260+
logger:error("Unexpected bundle content:~p", [Other]),
261261
State
262262
catch
263263
Class:Term:Trace ->
264-
logger:error("Error decoding OSC: ~p~n~p:~p~n~p~n",
264+
logger:error("Error decoding OSC: ~p~n~p:~p~n~p",
265265
[Bin, Class, Term, Trace]),
266266
State
267267
end,
@@ -280,11 +280,11 @@ schedule_internal_call(Time, Tag, State, Server, Msg) ->
280280
%% at that time, the message will be quietly dropped
281281
SchedMsg = {call, Server, Msg, Tracker},
282282
Timer = erlang:start_timer(MsDelay, self(), SchedMsg),
283-
logger:debug("start (MIDI) timer of ~w ms for time ~f~n", [MsDelay, Time]),
283+
logger:debug("start (MIDI) timer of ~w ms for time ~f", [MsDelay, Time]),
284284
tau_server_tracker:track(Timer, Time, Tracker);
285285
true ->
286286
Server ! Msg,
287-
logger:debug("Directly sent scheduled call~n", [])
287+
logger:debug("Directly sent scheduled call", [])
288288
end,
289289
NewState.
290290

@@ -309,7 +309,7 @@ tracker_pid(Tag, State) ->
309309
{Pid, State};
310310
error ->
311311
Pid = tau_server_tracker:start_link(Tag),
312-
logger:debug("start new tracker process for tag \"~s\"~n", [Tag]),
312+
logger:debug("start new tracker process for tag \"~s\"", [Tag]),
313313
{Pid, State#{tag_map := maps:put(Tag, Pid, TagMap)}}
314314
end.
315315

‎app/server/beam/tau/src/tau_server/tau_server_cue.erl

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ init(Parent) ->
6868
%% tell parent we have allocated resources and are up and running
6969
proc_lib:init_ack(Parent, {ok, self()}),
7070

71-
logger:debug("listening for OSC cues on socket: ~p~n",
71+
logger:debug("listening for OSC cues on socket: ~p",
7272
[try erlang:port_info(InSocket) catch _:_ -> undefined end]),
7373
State = #{parent => Parent,
7474
enabled => Enabled,
@@ -94,7 +94,7 @@ loop(State) ->
9494
forward_internal_cue(CueHost, CuePort, InSocket, Path, Args),
9595
?MODULE:loop(State);
9696
#{midi_enabled := false} ->
97-
logger:debug("MIDI cue forwarding disabled - ignored: ~p~n", [{Path, Args}]),
97+
logger:debug("MIDI cue forwarding disabled - ignored: ~p", [{Path, Args}]),
9898
?MODULE:loop(State)
9999
end;
100100

@@ -107,7 +107,7 @@ loop(State) ->
107107
forward_internal_cue(CueHost, CuePort, InSocket, "/link/num-peers", [NumPeers]),
108108
?MODULE:loop(State);
109109
_ ->
110-
logger:debug("Link cue forwarding disabled - ignored num_peers change ~n", []),
110+
logger:debug("Link cue forwarding disabled - ignored num_peers change ", []),
111111
?MODULE:loop(State)
112112
end;
113113

@@ -122,7 +122,7 @@ loop(State) ->
122122
send_api_tempo_update(CueHost, CuePort, InSocket, Tempo),
123123
?MODULE:loop(State);
124124
_ ->
125-
logger:debug("Link cue forwarding disabled - ignored tempo change ~n", []),
125+
logger:debug("Link cue forwarding disabled - ignored tempo change ", []),
126126
?MODULE:loop(State)
127127
end;
128128

@@ -135,7 +135,7 @@ loop(State) ->
135135
forward_internal_cue(CueHost, CuePort, InSocket, "/link/start", []),
136136
?MODULE:loop(State);
137137
_ ->
138-
logger:debug("Link cue forwarding disabled - ignored start message ~n", []),
138+
logger:debug("Link cue forwarding disabled - ignored start message ", []),
139139
?MODULE:loop(State)
140140
end;
141141

@@ -149,7 +149,7 @@ loop(State) ->
149149
forward_internal_cue(CueHost, CuePort, InSocket, "/link/stop", []),
150150
?MODULE:loop(State);
151151
_ ->
152-
logger:debug("Link cue forwarding disabled - ignored stop message ~n", []),
152+
logger:debug("Link cue forwarding disabled - ignored stop message ", []),
153153
?MODULE:loop(State)
154154
end;
155155

@@ -166,25 +166,25 @@ loop(State) ->
166166
?MODULE:loop(State);
167167

168168
{udp, InSocket, Ip, Port, Bin} ->
169-
logger:debug("cue server got UDP on ~p:~p~n", [Ip, Port]),
169+
logger:debug("cue server got UDP on ~p:~p", [Ip, Port]),
170170
try osc:decode(Bin) of
171171
%% TODO: handle {bundle, Time, X}?
172172
{cmd, Cmd} ->
173173
case State of
174174
#{enabled := true,
175175
cue_host := CueHost,
176176
cue_port := CuePort} ->
177-
loggfer:debug("got incoming OSC: ~p~n", [Cmd]),
177+
loggfer:debug("got incoming OSC: ~p", [Cmd]),
178178
forward_cue(CueHost, CuePort,
179179
InSocket, Ip, Port, Cmd),
180180
?MODULE:loop(State);
181181
#{enabled := false} ->
182-
logger:debug("OSC forwarding disabled - ignored: ~p~n", [Cmd]),
182+
logger:debug("OSC forwarding disabled - ignored: ~p", [Cmd]),
183183
?MODULE:loop(State)
184184
end
185185
catch
186186
Class:Term:Trace ->
187-
logger:error("Error decoding OSC: ~p~n~p:~p~n~p~n",
187+
logger:error("Error decoding OSC: ~p~n~p:~p~n~p",
188188
[Bin, Class, Term, Trace]),
189189
?MODULE:loop(State)
190190
end;
@@ -196,7 +196,7 @@ loop(State) ->
196196
#{internal := false,
197197
in_socket := InSocket,
198198
in_port := InPort} ->
199-
logger:info("Switching cue listener to loopback network~n"),
199+
logger:info("Switching cue listener to loopback network"),
200200
gen_udp:close(InSocket),
201201
{ok, NewInSocket} = gen_udp:open(InPort,
202202
[binary, {ip, loopback}]),
@@ -209,7 +209,7 @@ loop(State) ->
209209
#{internal := true,
210210
in_socket := InSocket,
211211
in_port := InPort} ->
212-
logger:info("Switching cue listener to open network~n"),
212+
logger:info("Switching cue listener to open network"),
213213
gen_udp:close(InSocket),
214214
{ok, NewInSocket} = gen_udp:open(InPort, [binary]),
215215
?MODULE:loop(State#{internal := false,
@@ -219,19 +219,19 @@ loop(State) ->
219219
end;
220220

221221
{enabled, true} ->
222-
logger:info("Enabling cue forwarding ~n"),
222+
logger:info("Enabling cue forwarding "),
223223
?MODULE:loop(State#{enabled := true});
224224

225225
{enabled, false} ->
226-
logger:info("Disabling cue forwarding ~n"),
226+
logger:info("Disabling cue forwarding "),
227227
?MODULE:loop(State#{enabled := false});
228228

229229
{midi_enabled, true} ->
230-
logger:info("Enabling midi cue forwarding ~n"),
230+
logger:info("Enabling midi cue forwarding "),
231231
?MODULE:loop(State#{midi_enabled := true});
232232

233233
{midi_enabled, false} ->
234-
logger:info("Disabling midi cue forwarding ~n"),
234+
logger:info("Disabling midi cue forwarding "),
235235
?MODULE:loop(State#{midi_enabled := false});
236236

237237
{send_osc, Host, Port, OSC} ->
@@ -240,7 +240,7 @@ loop(State) ->
240240

241241
{udp_error, _Port, econnreset} ->
242242
%% Should not happen, but can happen anyway on Windows
243-
logger:debug("got UDP ECONNRESET - ignored~n", []),
243+
logger:debug("got UDP ECONNRESET - ignored", []),
244244
?MODULE:loop(State);
245245

246246
{system, From, Request} ->
@@ -264,7 +264,7 @@ loop(State) ->
264264
send_udp(Socket, Host, Port, Bin),
265265
?MODULE:loop(State);
266266
Any ->
267-
logger:error("Cue Server got unexpected message: ~p~n", [Any]),
267+
logger:error("Cue Server got unexpected message: ~p", [Any]),
268268
?MODULE:loop(State)
269269

270270
end.
@@ -279,54 +279,54 @@ send_udp(Socket, Host, Port, Bin)
279279
{ok,_} ->
280280
case Mod:getserv(Port) of
281281
{ok,_} ->
282-
logger:debug("Sending UDP to - ~p ~p ~n", [Host, Port]),
282+
logger:debug("Sending UDP to - ~p ~p ", [Host, Port]),
283283
gen_udp:send(Socket, Host, Port, Bin);
284-
{error,einval} -> logger:debug("Unable to send UDP - bad hostname (getserv einval): ~p~n", [Host]);
285-
Error -> logger:error("Unable to send UDP - bad hostname (getserv ~p): ~p~n", [Error, Host])
284+
{error,einval} -> logger:debug("Unable to send UDP - bad hostname (getserv einval): ~p", [Host]);
285+
Error -> logger:error("Unable to send UDP - bad hostname (getserv ~p): ~p", [Error, Host])
286286
end;
287-
{error,einval} -> logger:error("Unable to send UDP - bad hostname (getaddr einval): ~p~n", [Host]);
288-
Error -> logger:error("Unable to send UDP - bad hostname (getaddr: ~p ): ~p~n", [Error, Host])
287+
{error,einval} -> logger:error("Unable to send UDP - bad hostname (getaddr einval): ~p", [Host]);
288+
Error -> logger:error("Unable to send UDP - bad hostname (getaddr: ~p ): ~p", [Error, Host])
289289
end;
290-
Error -> logger:error("Unable to send UDP - bad socket (~p): ~p~n", [Error, Host])
290+
Error -> logger:error("Unable to send UDP - bad socket (~p): ~p", [Error, Host])
291291
end.
292292

293293
update_midi_in_ports(CueHost, CuePort, InSocket, Args) ->
294294
Bin = osc:encode(["/midi-ins", "erlang" | Args]),
295295
send_udp(InSocket, CueHost, CuePort, Bin),
296-
logger:debug("forwarded new MIDI ins to ~p:~p~n", [CueHost, CuePort]),
296+
logger:debug("forwarded new MIDI ins to ~p:~p", [CueHost, CuePort]),
297297
ok.
298298

299299
update_midi_out_ports(CueHost, CuePort, InSocket, Args) ->
300300
Bin = osc:encode(["/midi-outs", "erlang" | Args]),
301301
send_udp(InSocket, CueHost, CuePort, Bin),
302-
logger:debug("forwarded new MIDI outs to ~p:~p~n", [CueHost, CuePort]),
302+
logger:debug("forwarded new MIDI outs to ~p:~p", [CueHost, CuePort]),
303303
ok.
304304

305305
send_api_reply(State, UUID, Args) ->
306306
CueHost = maps:get(cue_host, State),
307307
CuePort = maps:get(cue_port, State),
308308
InSocket = maps:get(in_socket, State),
309309
Bin = osc:encode(["/tau-api-reply", "erlang", UUID | Args]),
310-
%% logger:debug("send api reply ~p:~p~n", ToEncode),
310+
%% logger:debug("send api reply ~p:~p", ToEncode),
311311
send_udp(InSocket, CueHost, CuePort, Bin),
312312
ok.
313313

314314
send_api_tempo_update(CueHost, CuePort, InSocket, Tempo) ->
315315
Bin = osc:encode(["/link-tempo-change", "erlang", Tempo]),
316316
send_udp(InSocket, CueHost, CuePort, Bin),
317-
logger:debug("sending link tempo update [~p] to ~p:~p~n", [Tempo, CueHost, CuePort]),
317+
logger:debug("sending link tempo update [~p] to ~p:~p", [Tempo, CueHost, CuePort]),
318318
ok.
319319

320320
forward_internal_cue(CueHost, CuePort, InSocket, Path, Args) ->
321321
Bin = osc:encode(["/internal-cue", "erlang", Path | Args]),
322322
send_udp(InSocket, CueHost, CuePort, Bin),
323-
logger:debug("forwarded internal OSC cue to ~p:~p~n", [CueHost, CuePort]),
323+
logger:debug("forwarded internal OSC cue to ~p:~p", [CueHost, CuePort]),
324324
ok.
325325

326326
forward_cue(CueHost, CuePort, InSocket, Ip, Port, Cmd) ->
327327
Bin = osc:encode(["/external-osc-cue", inet:ntoa(Ip), Port] ++ Cmd),
328328
send_udp(InSocket, CueHost, CuePort, Bin),
329-
logger:debug("forwarded OSC cue to ~p:~p~n", [CueHost, CuePort]),
329+
logger:debug("forwarded OSC cue to ~p:~p", [CueHost, CuePort]),
330330
ok.
331331

332332

0 commit comments

Comments
 (0)