martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Decreased verbosity.

Browse Source
This commit is contained in:
Martin Preuss
2023-09-17 19:24:06 +02:00
parent 0814cf4af1
commit d6ae79cf81
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/aqhome-data/c_updatedata.c
View File

@@ -140,7 +140,7 @@ void _sendDataChangedMsgToAllClients(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epSrc,
if (GWEN_MsgEndpoint_GetFlags(ep) & AQH_IPCENDPOINT_FLAGS_WANTUPDATES) { if (GWEN_MsgEndpoint_GetFlags(ep) & AQH_IPCENDPOINT_FLAGS_WANTUPDATES) {
GWEN_MSG *msg; GWEN_MSG *msg;
DBG_INFO(AQH_LOGDOMAIN, "Sending update msg to endpoint %s", GWEN_MsgEndpoint_GetName(ep)); DBG_DEBUG(AQH_LOGDOMAIN, "Sending update msg to endpoint %s", GWEN_MsgEndpoint_GetName(ep));
msg=AQH_MultiDataDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_DATACHANGED, msg=AQH_MultiDataDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_DATACHANGED,
AQH_Value_GetNameForSystem(v), AQH_Value_GetNameForSystem(v),
AQH_Value_GetValueUnits(v), AQH_Value_GetValueUnits(v),
@@ -149,11 +149,11 @@ void _sendDataChangedMsgToAllClients(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epSrc,
GWEN_MsgEndpoint_AddSendMessage(ep, msg); GWEN_MsgEndpoint_AddSendMessage(ep, msg);
} }
else { else {
DBG_INFO(AQH_LOGDOMAIN, "Endpoint %s doesn't want updates", GWEN_MsgEndpoint_GetName(ep)); DBG_DEBUG(AQH_LOGDOMAIN, "Endpoint %s doesn't want updates", GWEN_MsgEndpoint_GetName(ep));
} }
} }
else { else {
DBG_INFO(AQH_LOGDOMAIN, "Not sending update msg to source of updates"); DBG_DEBUG(AQH_LOGDOMAIN, "Not sending update msg to source of updates");
} }
ep=GWEN_MsgEndpoint_Tree2_GetNext(ep); ep=GWEN_MsgEndpoint_Tree2_GetNext(ep);
} }

10
aqhome/data/datafile.c
View File

@@ -116,7 +116,7 @@ int AQH_DataFile_Create(AQH_DATAFILE *df)
} }
rv=_writeRecord(sio, 0, 0, 0.0); rv=_writeRecord(sio, 0, 0, 0.0);
if (rv<0) { if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "Error adding first record to file \"%s\" (%d)", df->fileName, rv); DBG_DEBUG(AQH_LOGDOMAIN, "Error adding first record to file \"%s\" (%d)", df->fileName, rv);
GWEN_SyncIo_free(sio); GWEN_SyncIo_free(sio);
return rv; return rv;
} }
@@ -150,7 +150,7 @@ int AQH_DataFile_Open(AQH_DATAFILE *df)
GWEN_SyncIo_SetFlags(sio, GWEN_SYNCIO_FILE_FLAGS_WRITE | GWEN_SYNCIO_FILE_FLAGS_READ); GWEN_SyncIo_SetFlags(sio, GWEN_SYNCIO_FILE_FLAGS_WRITE | GWEN_SYNCIO_FILE_FLAGS_READ);
rv=GWEN_SyncIo_Connect(sio); rv=GWEN_SyncIo_Connect(sio);
if (rv<0) { if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "Error creating file \"%s\" (%d)", df->fileName, rv); DBG_INFO(AQH_LOGDOMAIN, "Error opening file \"%s\" (%d)", df->fileName, rv);
GWEN_SyncIo_free(sio); GWEN_SyncIo_free(sio);
return rv; return rv;
} }
@@ -162,7 +162,7 @@ int AQH_DataFile_Open(AQH_DATAFILE *df)
return rv; return rv;
} }
if (len % AQH_DATAFILE_RECORDSIZE) { if (len % AQH_DATAFILE_RECORDSIZE) {
DBG_INFO(AQH_LOGDOMAIN, "Invalid file size of file \"%s\" ((not a multiple of current record size))", df->fileName); DBG_ERROR(AQH_LOGDOMAIN, "Invalid file size of file \"%s\" (not a multiple of current record size)", df->fileName);
GWEN_SyncIo_Disconnect(sio); GWEN_SyncIo_Disconnect(sio);
GWEN_SyncIo_free(sio); GWEN_SyncIo_free(sio);
unlink(df->fileName); unlink(df->fileName);
@@ -231,7 +231,7 @@ int AQH_DataFile_ReadRecord(AQH_DATAFILE *df, uint64_t idx, uint64_t *pTimestamp
rv=_readRecord(df->sio, idx, pTimestamp, pValue);; rv=_readRecord(df->sio, idx, pTimestamp, pValue);;
if (rv<0) { if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "Error writing to file \"%s\" (%d)", df->fileName, rv); DBG_INFO(AQH_LOGDOMAIN, "Error reading from file \"%s\" (%d)", df->fileName, rv);
return rv; return rv;
} }
@@ -264,7 +264,7 @@ int AQH_DataFile_AppendRecord(AQH_DATAFILE *df, uint64_t timestamp, double value
} }
df->numberOfEntries++; df->numberOfEntries++;
DBG_INFO(AQH_LOGDOMAIN, "File \"%s\" has now %lu entries", df->fileName, (unsigned long int) (df->numberOfEntries)); DBG_DEBUG(AQH_LOGDOMAIN, "File \"%s\" has now %lu entries", df->fileName, (unsigned long int) (df->numberOfEntries));
return 0; return 0;
} }
else { else {

15
aqhome/data/storage.c
View File

@@ -369,7 +369,7 @@ int AQH_Storage_AddDatapoint(AQH_STORAGE *sto, uint64_t valueId, uint64_t timest
df=_getDataFileByValueId(sto, valueId); df=_getDataFileByValueId(sto, valueId);
if (df) { if (df) {
DBG_INFO(AQH_LOGDOMAIN, "Appending record to datafile"); DBG_DEBUG(AQH_LOGDOMAIN, "Appending record to datafile");
AQH_DataFile_AppendRecord(df, timestamp, dataPoint); AQH_DataFile_AppendRecord(df, timestamp, dataPoint);
return 0; return 0;
} }
@@ -416,17 +416,16 @@ uint64_t *AQH_Storage_GetDataPoints(AQH_STORAGE *sto, uint64_t valueId, uint64_t
uint64_t ts; uint64_t ts;
int rv; int rv;
DBG_INFO(NULL, "Reading record %lu", (unsigned long int) i); DBG_DEBUG(NULL, "Reading record %lu", (unsigned long int) i);
rv=AQH_DataFile_ReadRecord(df, i, &ts, &(u.f)); rv=AQH_DataFile_ReadRecord(df, i, &ts, &(u.f));
if (rv<0) { if (rv<0) {
DBG_ERROR(AQH_LOGDOMAIN, "here (%d)", rv); DBG_ERROR(AQH_LOGDOMAIN, "here (%d)", rv);
free(arrayPtr); free(arrayPtr);
return NULL; return NULL;
} }
DBG_INFO(NULL, "Read record %lu (%lu - %lf)", (unsigned long int) i, (unsigned long int) ts, u.f); DBG_DEBUG(NULL, "Read record %lu (%lu - %lf)", (unsigned long int) i, (unsigned long int) ts, u.f);
if ((fromTime==0 || ts>=fromTime) && (toTime==0 || ts<=toTime)) { if ((fromTime==0 || ts>=fromTime) && (toTime==0 || ts<=toTime)) {
DBG_INFO(NULL, "Will add record %lu", (unsigned long int) i);
if (arrayPos>maxArrayLen) { if (arrayPos>maxArrayLen) {
DBG_INFO(AQH_LOGDOMAIN, "Limit for number of returned entries reached"); DBG_INFO(AQH_LOGDOMAIN, "Limit for number of returned entries reached");
break; break;
@@ -455,7 +454,7 @@ uint64_t *AQH_Storage_GetDataPoints(AQH_STORAGE *sto, uint64_t valueId, uint64_t
arrayPtr[arrayPos++]=u.i; arrayPtr[arrayPos++]=u.i;
} }
else { else {
DBG_INFO(NULL, "Entry %lu does not match", (unsigned long int) i); DBG_DEBUG(NULL, "Entry %lu does not match", (unsigned long int) i);
} }
} /* for */ } /* for */
@@ -643,13 +642,13 @@ AQH_DATAFILE *_getDataFileByValueId(AQH_STORAGE *sto, uint64_t valueId)
df=_findDataFileByValueId(sto, valueId); df=_findDataFileByValueId(sto, valueId);
if (df==NULL) { if (df==NULL) {
DBG_INFO(AQH_LOGDOMAIN, "Datafile for valueId \"%lu\" not in list, loading", (unsigned long int) valueId); DBG_DEBUG(AQH_LOGDOMAIN, "Datafile for valueId \"%lu\" not in list, loading", (unsigned long int) valueId);
df=_openOrCreateDataFileByValueId(sto, valueId); df=_openOrCreateDataFileByValueId(sto, valueId);
if (df==NULL) { if (df==NULL) {
DBG_ERROR(AQH_LOGDOMAIN, "Error opening/creating datafile for valueId \"%lu\"", (unsigned long int) valueId); DBG_ERROR(AQH_LOGDOMAIN, "Error opening/creating datafile for valueId \"%lu\"", (unsigned long int) valueId);
return NULL; return NULL;
} }
DBG_INFO(AQH_LOGDOMAIN, "Adding datafile for valueId \"%lu\" to list", (unsigned long int) valueId); DBG_DEBUG(AQH_LOGDOMAIN, "Adding datafile for valueId \"%lu\" to list", (unsigned long int) valueId);
AQH_DataFile_List_Add(df, sto->dataFileList); AQH_DataFile_List_Add(df, sto->dataFileList);
} }
@@ -682,7 +681,7 @@ AQH_DATAFILE *_openOrCreateDataFileByValueId(AQH_STORAGE *sto, uint64_t valueId)
GWEN_PATH_FLAGS_NAMEMUSTEXIST | GWEN_PATH_FLAGS_NAMEMUSTEXIST |
GWEN_PATH_FLAGS_VARIABLE); GWEN_PATH_FLAGS_VARIABLE);
if (rv==0) { if (rv==0) {
DBG_INFO(AQH_LOGDOMAIN, "File \"%s\" exists, trying to open", GWEN_Buffer_GetStart(nameBuf)); DBG_DEBUG(AQH_LOGDOMAIN, "File \"%s\" exists, trying to open", GWEN_Buffer_GetStart(nameBuf));
rv=AQH_DataFile_Open(df); rv=AQH_DataFile_Open(df);
if (rv<0) { if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "Error opening data file \"%s\" (%d)", GWEN_Buffer_GetStart(nameBuf), rv); DBG_INFO(AQH_LOGDOMAIN, "Error opening data file \"%s\" (%d)", GWEN_Buffer_GetStart(nameBuf), rv);