From 4049301b96653db6d0efddb85361047f45bbbcbc Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 8 Jan 2024 11:57:28 -0500 Subject: [PATCH] Don't log each table open/close, just the whole operation --- .../server/backends/berkeley_db/berkeley_db.c | 2 -- .../server/modules/calendar/serv_calendar.c | 20 ++++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/citadel/server/backends/berkeley_db/berkeley_db.c b/citadel/server/backends/berkeley_db/berkeley_db.c index 59b29ce7f..a8b8bcbd6 100644 --- a/citadel/server/backends/berkeley_db/berkeley_db.c +++ b/citadel/server/backends/berkeley_db/berkeley_db.c @@ -266,7 +266,6 @@ void bdb_open_databases(void) { } for (i = 0; i < MAXCDB; ++i) { - syslog(LOG_INFO, "bdb: mounting database %02x", i); ret = db_create(&bdb_table[i], bdb_env, 0); // Create a database handle if (ret) { syslog(LOG_ERR, "bdb: db_create: %s", db_strerror(ret)); @@ -312,7 +311,6 @@ void bdb_close_databases(void) { // close the tables syslog(LOG_INFO, "bdb: closing databases"); for (i = 0; i < MAXCDB; ++i) { - syslog(LOG_INFO, "bdb: closing database %02x", i); ret = bdb_table[i]->close(bdb_table[i], 0); if (ret) { syslog(LOG_ERR, "bdb: db_close: %s", db_strerror(ret)); diff --git a/citadel/server/modules/calendar/serv_calendar.c b/citadel/server/modules/calendar/serv_calendar.c index 6b05678a0..2569fb5dd 100644 --- a/citadel/server/modules/calendar/serv_calendar.c +++ b/citadel/server/modules/calendar/serv_calendar.c @@ -1545,8 +1545,9 @@ void ical_getics(void) { icalcomponent *encaps = NULL; char *ser = NULL; + // Only allow this operation if we're in a room containing a calendar or tasks view if ( (CC->room.QRdefaultview != VIEW_CALENDAR) - &&(CC->room.QRdefaultview != VIEW_TASKS) + && (CC->room.QRdefaultview != VIEW_TASKS) ) { cprintf("%d Not a calendar room\n", ERROR+NOT_HERE); return; // This room does not contain a calendar. @@ -1617,7 +1618,7 @@ void ical_putics(void) { && (CC->room.QRdefaultview != VIEW_TASKS) ) { cprintf("%d Not a calendar room\n", ERROR+NOT_HERE); - return; + return; // This room does not contain a calendar. } // Only allow this operation if we have permission to overwrite the existing calendar @@ -2330,7 +2331,20 @@ void ical_fixed_output(char *ptr, int len) { // fundamentally handled in the Citadel Server. A web implementation should be able to just // change the encapsulation to HTTP with the data format unchanged. void ical_report(void) { - cprintf("%d Hi from Citadel\n", CIT_OK); + char buf[SIZ]; + + // Only allow this operation if we're in a room containing a calendar or tasks view + if ( (CC->room.QRdefaultview != VIEW_CALENDAR) + && (CC->room.QRdefaultview != VIEW_TASKS) + ) { + cprintf("%d Not a calendar room\n", ERROR+NOT_HERE); + return; // This room does not contain a calendar. + } + + cprintf("%d Send query then receive response\n", SEND_THEN_RECV); + while(client_getln(buf, sizeof buf) >= 0 && strcmp(buf,"000")) { + } + cprintf("000\n"); } -- 2.30.2