Skip to content

Fix daliadmin set command reporting "Changed" on connection failure #157

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

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fix daliadmin set command reporting "Changed" on connection failure #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8026251
Initial plan
Copilot Nov 14, 2025
6e02a33
Fix daliadmin set command to only print 'Changed' on success
Copilot Nov 14, 2025
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
6 changes: 3 additions & 3 deletions dali/daliadmin/daadmin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,22 +253,22 @@ bool erase(const char *path, bool backup, StringBuffer &out)

//=============================================================================

StringBuffer &setValue(const char *path,const char *val,StringBuffer &oldVal)
bool setValue(const char *path,const char *val,StringBuffer &oldVal)
{
StringBuffer head;
StringBuffer tmp;
const char *tail=splitpath(path,head,tmp);
Owned<IRemoteConnection> conn = querySDS().connect(head.str(),myProcessSession(),RTM_LOCK_WRITE, daliConnectTimeoutMs);
if (!conn) {
UERRLOG("Could not connect to %s",path);
return oldVal;
return false;
}
Owned<IPropertyTree> root = conn->getRoot();
root->getProp(tail,oldVal);
root->setProp(tail,val);
conn->commit();
conn->close();
return oldVal;
return true;
}

//=============================================================================
Expand Down
2 changes: 1 addition & 1 deletion dali/daliadmin/daadmin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ extern DALIADMIN_API bool exportToXML(const char *path, StringBuffer &out, bool
extern DALIADMIN_API bool importFromFile(const char *path, const char *filename, bool add, StringBuffer &out);
extern DALIADMIN_API bool importFromXML(const char *path, const char *xml, bool add, StringBuffer &out);
extern DALIADMIN_API bool erase(const char *path, bool backup,StringBuffer &out);
extern DALIADMIN_API StringBuffer &setValue(const char *path, const char *val, StringBuffer &oldVal);
extern DALIADMIN_API bool setValue(const char *path, const char *val, StringBuffer &oldVal);
extern DALIADMIN_API void getValue(const char *path, StringBuffer& out);
extern DALIADMIN_API void bget(const char *path, const char *outfn);
extern DALIADMIN_API void wget(const char *path);
Expand Down
4 changes: 2 additions & 2 deletions dali/daliadmin/daliadmin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,8 @@ int main(int argc, const char* argv[])
}
else if (strieq(cmd,"set")) {
CHECKPARAMS(2,2);
setValue(params.item(1),params.item(2),out);
PROGLOG("Changed %s from '%s' to '%s'",params.item(1),out.str(),params.item(2));
if (setValue(params.item(1),params.item(2),out))
PROGLOG("Changed %s from '%s' to '%s'",params.item(1),out.str(),params.item(2));
}
else if (strieq(cmd,"get")) {
CHECKPARAMS(1,1);
Expand Down