Skip to content

Commit 0c02111

Browse files
committed
Reduce excessive logging and version bump
1 parent 6d99ada commit 0c02111

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fails-components/notepadhandler",
3-
"version": "0.0.3",
3+
"version": "0.0.4",
44
"description": "Supplies server side notepad handling",
55
"author": "Marten Richter",
66
"license": "AGPL-3.0-or-later",

src/notepadhandler.js

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export class NoteScreenConnection {
6868

6969
lastaccess(uuid) {
7070
// TODO
71-
console.log('lastaccess', uuid)
71+
// console.log('lastaccess', uuid)
7272
}
7373

7474
async emitscreenlists(args) {
@@ -85,12 +85,12 @@ export class NoteScreenConnection {
8585

8686
const readyscreens = await screens
8787

88-
console.log('avil notepadscreens', args.notescreenuuid, readyscreens)
88+
// console.log('avil notepadscreens', args.notescreenuuid, readyscreens)
8989
this.notepadio.to(roomname).emit('availscreens', { screens: readyscreens })
9090
this.screenio.to(roomname).emit('availscreens', { screens: readyscreens })
9191
this.notesio.to(roomname).emit('presinfo', readypresinfo)
9292
const readychannels = await channelinfo
93-
console.log('channelinfo', readychannels)
93+
// console.log('channelinfo', readychannels)
9494

9595
this.notepadio.to(roomname).emit('channelinfo', readychannels)
9696
this.screenio.to(roomname).emit('channelinfo', readychannels)
@@ -110,7 +110,7 @@ export class NoteScreenConnection {
110110
console.log('Client username', socket.decoded_token.user.displayname)
111111
else console.log('no decoded token')
112112

113-
console.log('decoded token', socket.decoded_token)
113+
// console.log('decoded token', socket.decoded_token)
114114

115115
if (!isUUID(socket.decoded_token.lectureuuid)) {
116116
console.log('lectureuuid in decoded token invalid')
@@ -167,7 +167,7 @@ export class NoteScreenConnection {
167167

168168
memcont.replaceStoredData(ab)
169169
const cs = memcont.getCurCommandState()
170-
console.log('cs state', cs)
170+
// console.log('cs state', cs)
171171
dispatcher.setTimeandScrollPos(cs.time, cs.scrollx, cs.scrolly)
172172
if (socket) {
173173
socket.emit('drawcommand', {
@@ -215,7 +215,7 @@ export class NoteScreenConnection {
215215
socket.on(
216216
'sendboards',
217217
function (cmd) {
218-
console.log('notepad connected, send board data')
218+
// console.log('notepad connected, send board data')
219219
this.sendBoardsToSocket(notepadscreenid.lectureuuid, socket)
220220
socket.emit('drawcommand', {
221221
task: 'scrollBoard',
@@ -252,7 +252,7 @@ export class NoteScreenConnection {
252252
)
253253

254254
socket.on('createchannel', () => {
255-
console.log('createchannel')
255+
// console.log('createchannel')
256256
this.addNewChannel(
257257
notepadscreenid,
258258
'notebooks',
@@ -263,7 +263,7 @@ export class NoteScreenConnection {
263263
socket.on(
264264
'updatesizes',
265265
function (cmd) {
266-
console.log('peek updatesizes', cmd)
266+
// console.log('peek updatesizes', cmd)
267267

268268
this.setLectureProperties(
269269
notepadscreenid,
@@ -365,13 +365,13 @@ export class NoteScreenConnection {
365365
'addnotescreentochannel',
366366
function (cmd) {
367367
// TODO new concept
368-
console.log('check addnotescreen cmd', cmd)
368+
// console.log('check addnotescreen cmd', cmd)
369369
if (isUUID(cmd.notescreenuuid) && isUUID(cmd.channeluuid)) {
370-
console.log(
370+
/* console.log(
371371
'addnotescreentochannel',
372372
cmd.notescreenuuid,
373373
cmd.channeluuid
374-
)
374+
) */
375375
this.assignNoteScreenToChannel({
376376
channeluuid: cmd.channeluuid,
377377
lectureuuid: notepadscreenid.lectureuuid,
@@ -384,9 +384,9 @@ export class NoteScreenConnection {
384384
socket.on(
385385
'removechannel',
386386
function (cmd) {
387-
console.log('removechannel', cmd)
387+
// console.log('removechannel', cmd)
388388
if (isUUID(cmd.channeluuid)) {
389-
console.log('removechannel request', cmd.channeluuid)
389+
// console.log('removechannel request', cmd.channeluuid)
390390
this.removeChannel(notepadscreenid, cmd.channeluuid)
391391
}
392392
}.bind(this)
@@ -432,18 +432,18 @@ export class NoteScreenConnection {
432432

433433
let curtoken = socket.decoded_token
434434

435-
console.log('screen connected')
435+
// console.log('screen connected')
436436

437437
// bIG TODO
438438
this.getLectDetail(purescreen, socket)
439439

440-
console.log('screen send board data')
440+
// console.log('screen send board data')
441441
this.sendBoardsToSocket(purescreen.lectureuuid, socket)
442442
purescreen.roomname = this.getRoomName(purescreen.lectureuuid)
443-
console.log(
443+
/* console.log(
444444
'screen is connected to notepad, join room',
445445
purescreen.roomname
446-
)
446+
) */
447447
socket.join(purescreen.roomname)
448448

449449
/* } else {
@@ -496,7 +496,7 @@ export class NoteScreenConnection {
496496
if (purescreen) {
497497
if (purescreen.roomname) {
498498
socket.leave(purescreen.roomname)
499-
console.log('screen disconnected leave room', purescreen.roomname)
499+
// console.log('screen disconnected leave room', purescreen.roomname)
500500
purescreen.roomname = null
501501
}
502502
/* if (purescreen.socketid) {
@@ -625,7 +625,7 @@ export class NoteScreenConnection {
625625
}
626626

627627
updateNoteScreen(args, scrollheight, purpose) {
628-
console.log('update notescreen', scrollheight, purpose, args)
628+
// console.log('update notescreen', scrollheight, purpose, args)
629629
this.redis.hmset(
630630
'lecture:' + args.lectureuuid + ':notescreen:' + args.notescreenuuid,
631631
'scrollheight',
@@ -876,7 +876,7 @@ export class NoteScreenConnection {
876876

877877
let lock = null
878878
try {
879-
console.log(' try to lock ', 'lecture:' + lectureuuid + ':loadlock')
879+
// console.log(' try to lock ', 'lecture:' + lectureuuid + ':loadlock')
880880
lock = await this.redlock.lock(
881881
'lecture:' + lectureuuid + ':loadlock',
882882
2000
@@ -905,7 +905,7 @@ export class NoteScreenConnection {
905905
const boardsavetime = lecturedoc.boardsavetime
906906
const backgroundbw = lecturedoc.backgroundbw
907907
lastwrite = await lastwrite
908-
console.log('lastwrite', lastwrite, boardsavetime, lecturedoc)
908+
// console.log('lastwrite', lastwrite, boardsavetime, lecturedoc)
909909

910910
if (!boardsavetime) {
911911
lock.unlock()
@@ -936,7 +936,7 @@ export class NoteScreenConnection {
936936
)
937937
redisprom.push(myprom)
938938
}
939-
console.log('cursor it finished')
939+
// console.log('cursor it finished')
940940
await Promise.all(redisprom) // ok wait that everything is transfered and then update the time
941941
if (boards.length > 0)
942942
await sadd('lecture:' + lectureuuid + ':boards', boards)
@@ -974,12 +974,12 @@ export class NoteScreenConnection {
974974
// TODO sync to mongodb
975975
if (err) console.log('boards in sendBoardsToSocket picture', err)
976976
else {
977-
console.log('boards', res, 'lecture:' + lectureuuid + ':boards')
977+
// console.log('boards', res, 'lecture:' + lectureuuid + ':boards')
978978
const length = res.length
979979
let countdown = length
980980
for (const index in res) {
981981
const boardnum = res[index]
982-
console.log('sendBoardsToSocket', boardnum, lectureuuid)
982+
// console.log('sendBoardsToSocket', boardnum, lectureuuid)
983983
this.redis.get(
984984
Buffer.from('lecture:' + lectureuuid + ':board' + boardnum),
985985
function (err2, res2) {
@@ -1030,7 +1030,7 @@ export class NoteScreenConnection {
10301030
emitscreens // notebooks or screencast
10311031
) {
10321032
const newuuid = uuidv4()
1033-
console.log('addnewchannel')
1033+
// console.log('addnewchannel')
10341034
this.redis
10351035
.multi()
10361036
.lrem('lecture:' + args.lectureuuid + ':channels', 0, newuuid)
@@ -1133,13 +1133,13 @@ export class NoteScreenConnection {
11331133
])
11341134
})
11351135
)
1136-
console.log('todelete', todelete)
1136+
// console.log('todelete', todelete)
11371137
todelete = todelete
11381138
.filter((el) =>
11391139
el[1] ? Date.now() - el[1][1] > 20 * 60 * 1000 : false
11401140
) // inverted active condition
11411141
.map((el) => el[0])
1142-
console.log('todelete filter', todelete)
1142+
// console.log('todelete filter', todelete)
11431143
if (todelete.length === 0) return // we are ready
11441144

11451145
// now we have the list of notescreens for potential deletion, we have to watch all these recprds and check it again
@@ -1178,7 +1178,7 @@ export class NoteScreenConnection {
11781178
const channelwatch = channels.map(
11791179
(el) => 'lecture:' + args.lectureuuid + ':channel:' + el + ':members'
11801180
)
1181-
console.log('channelwatch', channelwatch)
1181+
// console.log('channelwatch', channelwatch)
11821182

11831183
if (channelwatch.length > 0) this.redis.watch(channelwatch) // also watch the channelmembers
11841184
// now we are sure they are for deletion start the multi
@@ -1205,7 +1205,7 @@ export class NoteScreenConnection {
12051205
}
12061206

12071207
connectNotescreen(args) {
1208-
console.log('connectnotepads', args)
1208+
// console.log('connectnotepads', args)
12091209
this.lastaccess(args.lectureuuid)
12101210
this.redis
12111211
.multi()
@@ -1235,7 +1235,7 @@ export class NoteScreenConnection {
12351235
let channel
12361236
if (res) {
12371237
channel = res
1238-
console.log('already have channel', res)
1238+
// console.log('already have channel', res)
12391239
this.redis
12401240
.multi()
12411241
.lrem(
@@ -1265,11 +1265,11 @@ export class NoteScreenConnection {
12651265
1,
12661266
(err, res) => {
12671267
if (!err) channel = res[0]
1268-
console.log('channel 1', channel)
1268+
// console.log('channel 1', channel)
12691269
if (!channel) {
12701270
channel = this.addNewChannel(args, 'notebooks')
12711271
}
1272-
console.log('channel 2', channel)
1272+
// console.log('channel 2', channel)
12731273
this.redis
12741274
.multi()
12751275
.hset(
@@ -1361,7 +1361,7 @@ export class NoteScreenConnection {
13611361
const screens = await smembers(
13621362
'lecture:' + args.lectureuuid + ':notescreens'
13631363
)
1364-
console.log('our screens', screens)
1364+
// console.log('our screens', screens)
13651365
const screenret = Promise.all(
13661366
screens.map(async (el, ind) => {
13671367
const temp = await hmget(
@@ -1494,7 +1494,7 @@ export class NoteScreenConnection {
14941494
type: el[2][0]
14951495
}))
14961496
lectprop = await lectprop
1497-
console.log('channellayout', toret)
1497+
// console.log('channellayout', toret)
14981498
return {
14991499
channelinfo: toret,
15001500
casttoscreens: lectprop[0],
@@ -1508,7 +1508,7 @@ export class NoteScreenConnection {
15081508
}
15091509

15101510
assignNoteScreenToChannel(args) {
1511-
console.log('assignNotePadToChannel', args)
1511+
// console.log('assignNotePadToChannel', args)
15121512
try {
15131513
// TODO get content of old channel
15141514
this.redis.watch(

0 commit comments

Comments
 (0)