Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-apply changes from commit ec9071116172adef6adde0a384cff2c1cce28abd #304

Merged
merged 14 commits into from
Sep 20, 2024
Merged

Re-apply changes from commit ec9071116172adef6adde0a384cff2c1cce28abd #304

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
08edbcb
Reapply "Merge branch 'develop' of github.com:Infomaniak/desktop-kDri…
ClementKunz Sep 18, 2024
094852d
Adresse a missing defult case in a toString converter.
herve-er Sep 18, 2024
0437f8f
Adresse compil warning about a risk of overflow.
herve-er Sep 18, 2024
332975c
Fix a compilation warning about implicit conversion.
herve-er Sep 18, 2024
a39066a
Remove misleading comment
ClementKunz Sep 18, 2024
5769e17
Merge branch 'Add-back-changes-on-folder-watcher-mac' of github.com:I…
ClementKunz Sep 18, 2024
f5bb0a5
Extract method and create unit tests
ClementKunz Sep 19, 2024
3221738
Add unit tests on Types
ClementKunz Sep 19, 2024
ce86cea
Fix build error
ClementKunz Sep 19, 2024
497dc26
Address PR comment
ClementKunz Sep 19, 2024
cef26d0
Fix build error
ClementKunz Sep 19, 2024
24f2bb8
Fix a risk of overflow.
herve-er Sep 19, 2024
3781398
Merge branch 'Add-back-changes-on-folder-watcher-mac' of https://gith…
herve-er Sep 19, 2024
4fe395a
Update test/libcommon/utility/testtypes.cpp
ClementKunz Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions infomaniak-build-tools/kDrive-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ <h2><b>Bug fixes</b></h2>
<ul>
<li>Fixed a sync issue occurring on files whose name contains a special character</li>
<li>Corrected behaviour in the event of disconnection</li>
<li>Fixed empty file list retrieved in case of poor network connection</li>
<li>Fixed issue generating lots of conflicted files while using specific software</li>
<li>Fixed issue where an empty file list is retrieved in case of poor network connection</li>
<li>Fixed an issue causing many conflicting files when using specific software</li>
<li>Fixed a sync issue generating infinite loop</li>
<li>Windows - Code optimization to reduce duration of step 1 and 2</li>
<li>Windows - Code optimization to reduce duration of steps 1 and 2</li>
<li>macOS - Fixed unwanted popup message on session logout</li>
</ul>
</body>
</html>
6 changes: 3 additions & 3 deletions ...0240906/kDrive-3.6.5.20240906-win-de.html → ....5.20240910/kDrive-3.6.5.20240910-de.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ <h2><b>Fehlerbehebungen</b></h2>
<ul>
<li>Ein Synchronisierungsproblem bei Dateien, deren Name ein Sonderzeichen enth&auml;lt, wurde behoben</li>
<li>Korrigiertes Verhalten im Falle einer Unterbrechung der Verbindung</li>
<li>Behebung der leeren Dateiliste, die bei schlechter Netzwerkverbindung abgerufen wird</li>
<li>Problem behoben, das bei der Verwendung bestimmter Software viele konfliktbehaftete Dateien erzeugt</li>
<li>Problem behoben, bei dem eine leere Dateiliste im Falle einer schlechten Netzwerkverbindung abgerufen wird</li>
<li>Es wurde ein Problem behoben, das bei der Verwendung bestimmter Software zu vielen widerspr&uuml;chlichen Dateien f&uuml;hrte</li>
<li>Sync-Problem behoben, das zu einer Endlosschleife f&uuml;hrte</li>
<li>Codeoptimierung zur Verk&uuml;rzung der Dauer von Schritt 1 und 2</li>
<li>Unerw&uuml;nschte Popup-Meldung bei Sitzungsabmeldung behoben</li>
</ul>
</body>
</html>
7 changes: 4 additions & 3 deletions ....5.20240906/kDrive-3.6.5.20240906-es.html → ....5.20240910/kDrive-3.6.5.20240910-es.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
<h1>Notas de la versi&oacute;n - kDrive 3.6.5</h1>
<h2><b>Correcci&oacute;n de errores</b></h2>
<ul>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial.</li>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial</li>
<li>Comportamiento corregido en caso de desconexi&oacute;n</li>
<li>Corregida la lista de archivos vac&iacute;a recuperada en caso de conexi&oacute;n de red deficiente.</li>
<li>Se ha solucionado un problema que generaba muchos archivos en conflicto al utilizar software espec&iacute;fico.</li>
<li>Se ha solucionado el problema por el que se recuperaba una lista de archivos vac&iacute;a en caso de conexi&oacute;n de red deficiente</li>
<li>Se ha corregido un problema que provocaba muchos archivos conflictivos al utilizar software espec&iacute;fico</li>
<li>Solucionado un problema de sincronizaci&oacute;n que generaba un bucle infinito</li>
<li>Corregido un mensaje emergente no deseado al cerrar la sesi&oacute;n</li>
</ul>
</body>
</html>
5 changes: 3 additions & 2 deletions ....5.20240906/kDrive-3.6.5.20240906-fr.html → ....5.20240910/kDrive-3.6.5.20240910-fr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ <h2><b>Correction de bugs</b></h2>
<ul>
<li>Correction d'un probl&egrave;me de synchronisation sur les fichiers dont le nom contient un caract&egrave;re sp&eacute;cial</li>
<li>Comportement corrig&eacute; en cas de d&eacute;connexion</li>
<li>Correction de la liste des fichiers vides r&eacute;cup&eacute;r&eacute;s en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me g&eacute;n&eacute;rant de nombreux fichiers conflictuels lors de l'utilisation d'un logiciel sp&eacute;cifique</li>
<li>Correction d'un probl&egrave;me o&ugrave; une liste de fichiers vide est r&eacute;cup&eacute;r&eacute;e en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me provoquant de nombreux conflits de fichiers lors de l'utilisation de certains logiciels</li>
<li>Correction d'un probl&egrave;me de synchronisation g&eacute;n&eacute;rant une boucle infinie</li>
<li>Correction d'un message popup ind&eacute;sirable lors de la d&eacute;connexion d'une session</li>
</ul>
</body>
</html>
7 changes: 4 additions & 3 deletions ....5.20240906/kDrive-3.6.5.20240906-it.html → ....5.20240910/kDrive-3.6.5.20240910-it.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
<h1>Note di rilascio - kDrive 3.6.5</h1>
<h2><b>Correzioni di bug</b></h2>
<ul>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale.</li>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale</li>
<li>Comportamento corretto in caso di disconnessione</li>
<li>Corretto l'elenco dei file vuoti recuperati in caso di scarsa connessione di rete</li>
<li>Corretto il problema che genera molti file in conflitto quando si utilizza un software specifico.</li>
<li>Corretto il problema per cui viene recuperato un elenco di file vuoto in caso di connessione di rete scadente</li>
<li>&Egrave; stato risolto un problema che causava molti file in conflitto quando si utilizzava un software specifico</li>
<li>Corretto un problema di sincronizzazione che generava un loop infinito</li>
<li>Corretto il messaggio popup indesiderato al logout della sessione</li>
</ul>
</body>
</html>
4 changes: 2 additions & 2 deletions ....5.20240906/kDrive-3.6.5.20240906-de.html → ...40910/kDrive-3.6.5.20240910-linux-de.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h2><b>Fehlerbehebungen</b></h2>
<ul>
<li>Ein Synchronisierungsproblem bei Dateien, deren Name ein Sonderzeichen enth&auml;lt, wurde behoben</li>
<li>Korrigiertes Verhalten im Falle einer Unterbrechung der Verbindung</li>
<li>Behebung der leeren Dateiliste, die bei schlechter Netzwerkverbindung abgerufen wird</li>
<li>Problem behoben, das bei der Verwendung bestimmter Software viele konfliktbehaftete Dateien erzeugt</li>
<li>Problem behoben, bei dem eine leere Dateiliste im Falle einer schlechten Netzwerkverbindung abgerufen wird</li>
<li>Es wurde ein Problem behoben, das bei der Verwendung bestimmter Software zu vielen widerspr&uuml;chlichen Dateien f&uuml;hrte</li>
<li>Sync-Problem behoben, das zu einer Endlosschleife f&uuml;hrte</li>
</ul>
</body>
Expand Down
6 changes: 3 additions & 3 deletions ...40906/kDrive-3.6.5.20240906-linux-es.html → ...40910/kDrive-3.6.5.20240910-linux-es.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<h1>Notas de la versi&oacute;n - kDrive 3.6.5</h1>
<h2><b>Correcci&oacute;n de errores</b></h2>
<ul>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial.</li>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial</li>
<li>Comportamiento corregido en caso de desconexi&oacute;n</li>
<li>Corregida la lista de archivos vac&iacute;a recuperada en caso de conexi&oacute;n de red deficiente.</li>
<li>Se ha solucionado un problema que generaba muchos archivos en conflicto al utilizar software espec&iacute;fico.</li>
<li>Se ha solucionado el problema por el que se recuperaba una lista de archivos vac&iacute;a en caso de conexi&oacute;n de red deficiente</li>
<li>Se ha corregido un problema que provocaba muchos archivos conflictivos al utilizar software espec&iacute;fico</li>
<li>Solucionado un problema de sincronizaci&oacute;n que generaba un bucle infinito</li>
</ul>
</body>
Expand Down
4 changes: 2 additions & 2 deletions ...40906/kDrive-3.6.5.20240906-linux-fr.html → ...40910/kDrive-3.6.5.20240910-linux-fr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h2><b>Correction de bugs</b></h2>
<ul>
<li>Correction d'un probl&egrave;me de synchronisation sur les fichiers dont le nom contient un caract&egrave;re sp&eacute;cial</li>
<li>Comportement corrig&eacute; en cas de d&eacute;connexion</li>
<li>Correction de la liste des fichiers vides r&eacute;cup&eacute;r&eacute;s en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me g&eacute;n&eacute;rant de nombreux fichiers conflictuels lors de l'utilisation d'un logiciel sp&eacute;cifique</li>
<li>Correction d'un probl&egrave;me o&ugrave; une liste de fichiers vide est r&eacute;cup&eacute;r&eacute;e en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me provoquant de nombreux conflits de fichiers lors de l'utilisation de certains logiciels</li>
<li>Correction d'un probl&egrave;me de synchronisation g&eacute;n&eacute;rant une boucle infinie</li>
</ul>
</body>
Expand Down
6 changes: 3 additions & 3 deletions ...40906/kDrive-3.6.5.20240906-linux-it.html → ...40910/kDrive-3.6.5.20240910-linux-it.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<h1>Note di rilascio - kDrive 3.6.5</h1>
<h2><b>Correzioni di bug</b></h2>
<ul>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale.</li>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale</li>
<li>Comportamento corretto in caso di disconnessione</li>
<li>Corretto l'elenco dei file vuoti recuperati in caso di scarsa connessione di rete</li>
<li>Corretto il problema che genera molti file in conflitto quando si utilizza un software specifico.</li>
<li>Corretto il problema per cui viene recuperato un elenco di file vuoto in caso di connessione di rete scadente</li>
<li>&Egrave; stato risolto un problema che causava molti file in conflitto quando si utilizzava un software specifico</li>
<li>Corretto un problema di sincronizzazione che generava un loop infinito</li>
</ul>
</body>
Expand Down
4 changes: 2 additions & 2 deletions ...20240906/kDrive-3.6.5.20240906-linux.html → ...20240910/kDrive-3.6.5.20240910-linux.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h2><b>Bug fixes</b></h2>
<ul>
<li>Fixed a sync issue occurring on files whose name contains a special character</li>
<li>Corrected behaviour in the event of disconnection</li>
<li>Fixed empty file list retrieved in case of poor network connection</li>
<li>Fixed issue generating lots of conflicted files while using specific software</li>
<li>Fixed issue where an empty file list is retrieved in case of poor network connection</li>
<li>Fixed an issue causing many conflicting files when using specific software</li>
<li>Fixed a sync issue generating infinite loop</li>
</ul>
</body>
Expand Down
5 changes: 3 additions & 2 deletions ...40906/kDrive-3.6.5.20240906-linux-de.html → ...0240910/kDrive-3.6.5.20240910-win-de.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ <h2><b>Fehlerbehebungen</b></h2>
<ul>
<li>Ein Synchronisierungsproblem bei Dateien, deren Name ein Sonderzeichen enth&auml;lt, wurde behoben</li>
<li>Korrigiertes Verhalten im Falle einer Unterbrechung der Verbindung</li>
<li>Behebung der leeren Dateiliste, die bei schlechter Netzwerkverbindung abgerufen wird</li>
<li>Problem behoben, das bei der Verwendung bestimmter Software viele konfliktbehaftete Dateien erzeugt</li>
<li>Problem behoben, bei dem eine leere Dateiliste im Falle einer schlechten Netzwerkverbindung abgerufen wird</li>
<li>Es wurde ein Problem behoben, das bei der Verwendung bestimmter Software zu vielen widerspr&uuml;chlichen Dateien f&uuml;hrte</li>
<li>Sync-Problem behoben, das zu einer Endlosschleife f&uuml;hrte</li>
<li>Code-Optimierung zur Verk&uuml;rzung der Dauer der Schritte 1 und 2</li>
</ul>
</body>
</html>
6 changes: 3 additions & 3 deletions ...0240906/kDrive-3.6.5.20240906-win-es.html → ...0240910/kDrive-3.6.5.20240910-win-es.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<h1>Notas de la versi&oacute;n - kDrive 3.6.5</h1>
<h2><b>Correcci&oacute;n de errores</b></h2>
<ul>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial.</li>
<li>Se ha corregido un problema de sincronizaci&oacute;n que se produc&iacute;a en archivos cuyo nombre conten&iacute;a un car&aacute;cter especial</li>
<li>Comportamiento corregido en caso de desconexi&oacute;n</li>
<li>Corregida la lista de archivos vac&iacute;a recuperada en caso de conexi&oacute;n de red deficiente.</li>
<li>Se ha solucionado un problema que generaba muchos archivos en conflicto al utilizar software espec&iacute;fico.</li>
<li>Se ha solucionado el problema por el que se recuperaba una lista de archivos vac&iacute;a en caso de conexi&oacute;n de red deficiente</li>
<li>Se ha corregido un problema que provocaba muchos archivos conflictivos al utilizar software espec&iacute;fico</li>
<li>Solucionado un problema de sincronizaci&oacute;n que generaba un bucle infinito</li>
<li>Optimizaci&oacute;n del c&oacute;digo para reducir la duraci&oacute;n de los pasos 1 y 2</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions ...0240906/kDrive-3.6.5.20240906-win-fr.html → ...0240910/kDrive-3.6.5.20240910-win-fr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ <h2><b>Correction de bugs</b></h2>
<ul>
<li>Correction d'un probl&egrave;me de synchronisation sur les fichiers dont le nom contient un caract&egrave;re sp&eacute;cial</li>
<li>Comportement corrig&eacute; en cas de d&eacute;connexion</li>
<li>Correction de la liste des fichiers vides r&eacute;cup&eacute;r&eacute;s en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me g&eacute;n&eacute;rant de nombreux fichiers conflictuels lors de l'utilisation d'un logiciel sp&eacute;cifique</li>
<li>Correction d'un probl&egrave;me o&ugrave; une liste de fichiers vide est r&eacute;cup&eacute;r&eacute;e en cas de mauvaise connexion r&eacute;seau</li>
<li>Correction d'un probl&egrave;me provoquant de nombreux conflits de fichiers lors de l'utilisation de certains logiciels</li>
<li>Correction d'un probl&egrave;me de synchronisation g&eacute;n&eacute;rant une boucle infinie</li>
<li>Optimisation du code pour r&eacute;duire la dur&eacute;e des &eacute;tapes 1 et 2</li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions ...0240906/kDrive-3.6.5.20240906-win-it.html → ...0240910/kDrive-3.6.5.20240910-win-it.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<h1>Note di rilascio - kDrive 3.6.5</h1>
<h2><b>Correzioni di bug</b></h2>
<ul>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale.</li>
<li>&Egrave; stato risolto un problema di sincronizzazione dei file il cui nome contiene un carattere speciale</li>
<li>Comportamento corretto in caso di disconnessione</li>
<li>Corretto l'elenco dei file vuoti recuperati in caso di scarsa connessione di rete</li>
<li>Corretto il problema che genera molti file in conflitto quando si utilizza un software specifico.</li>
<li>Corretto il problema per cui viene recuperato un elenco di file vuoto in caso di connessione di rete scadente</li>
<li>&Egrave; stato risolto un problema che causava molti file in conflitto quando si utilizzava un software specifico</li>
<li>Corretto un problema di sincronizzazione che generava un loop infinito</li>
<li>Ottimizzazione del codice per ridurre la durata dei passaggi 1 e 2</li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions ...5.20240906/kDrive-3.6.5.20240906-win.html → ...5.20240910/kDrive-3.6.5.20240910-win.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ <h2><b>Bug fixes</b></h2>
<ul>
<li>Fixed a sync issue occurring on files whose name contains a special character</li>
<li>Corrected behaviour in the event of disconnection</li>
<li>Fixed empty file list retrieved in case of poor network connection</li>
<li>Fixed issue generating lots of conflicted files while using specific software</li>
<li>Fixed issue where an empty file list is retrieved in case of poor network connection</li>
<li>Fixed an issue causing many conflicting files when using specific software</li>
<li>Fixed a sync issue generating infinite loop</li>
<li>Code optimization to reduce duration of step 1 and 2</li>
<li>Code optimization to reduce duration of steps 1 and 2</li>
</ul>
</body>
</html>
5 changes: 3 additions & 2 deletions ...3.6.5.20240906/kDrive-3.6.5.20240906.html → ...3.6.5.20240910/kDrive-3.6.5.20240910.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ <h2><b>Bug fixes</b></h2>
<ul>
<li>Fixed a sync issue occurring on files whose name contains a special character</li>
<li>Corrected behaviour in the event of disconnection</li>
<li>Fixed empty file list retrieved in case of poor network connection</li>
<li>Fixed issue generating lots of conflicted files while using specific software</li>
<li>Fixed issue where an empty file list is retrieved in case of poor network connection</li>
<li>Fixed an issue causing many conflicting files when using specific software</li>
<li>Fixed a sync issue generating infinite loop</li>
<li>Fixed unwanted popup message on session logout</li>
</ul>
</body>
</html>
2 changes: 1 addition & 1 deletion src/libcommon/log/sentry/sentryhandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ void SentryHandler::handleEventsRateLimit(SentryEvent &event, bool &toUpload) {
}

auto &storedEvent = it->second;
storedEvent.captureCount++;
storedEvent.captureCount = std::min(storedEvent.captureCount + 1, UINT_MAX-1);
event.captureCount = storedEvent.captureCount;

if (lastEventCaptureIsOutdated(storedEvent)) { // Reset the capture count if the last capture was more than 10 minutes ago
Expand Down
4 changes: 3 additions & 1 deletion src/libcommon/log/sentry/sentryhandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ inline std::string toString(SentryLevel level) {
return "Error";
case SentryLevel::Fatal:
return "Fatal";
default:
return "No conversion to string available";
}
};

Expand Down Expand Up @@ -141,7 +143,7 @@ class SentryHandler {
std::unordered_map<std::string, SentryEvent, StringHash, std::equal_to<>> _events;
SentryConfidentialityLevel _globalConfidentialityLevel = SentryConfidentialityLevel::Anonymous; // Default value
SentryConfidentialityLevel _lastConfidentialityLevel = SentryConfidentialityLevel::None;
int _sentryMaxCaptureCountBeforeRateLimit = 10; // Number of capture before rate limiting an event
unsigned int _sentryMaxCaptureCountBeforeRateLimit = 10; // Number of capture before rate limiting an event
int _sentryMinUploadIntervaOnRateLimit = 60; // Min. interval between two uploads of a rate limited event (seconds)
bool _isSentryActivated = false;
};
Expand Down
10 changes: 5 additions & 5 deletions src/libcommon/utility/jsonparserutility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
namespace KDC {

struct COMMONSERVER_EXPORT JsonParserUtility {
template <typename T>
static bool extractValue(const Poco::JSON::Object::Ptr obj, const std::string &key, T &val, bool mandatory = true) {
template<typename T>
static bool extractValue(const Poco::JSON::Object::Ptr obj, const std::string &key, T &val, const bool mandatory = true) {
if (!obj) {
LOG_WARN(Log::instance()->getLogger(), "JSON object is NULL");
return false;
} // namespace KDC
} // namespace KDC

if (obj->has(key) && obj->isNull(key)) {
// Item exist in JSON but is null, this is ok
Expand All @@ -45,7 +45,7 @@ struct COMMONSERVER_EXPORT JsonParserUtility {
var.convert(val);
} catch (...) {
if (mandatory) {
std::string msg = "Fail to extract value for key=" + key;
const std::string msg = "Fail to extract value for key=" + key;
LOG_WARN(Log::instance()->getLogger(), msg.c_str());
SentryHandler::instance()->captureMessage(SentryLevel::Error, "JsonParserUtility::extractValue", msg);
return false;
Expand Down Expand Up @@ -84,4 +84,4 @@ struct COMMONSERVER_EXPORT JsonParserUtility {
}
};

} // namespace KDC
} // namespace KDC
Loading
Loading