peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-06 07:33:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

bin: use CONFD_TIMEOUT for all copy operations

Browse Source 
Fixes #701

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-10-16 06:10:39 +02:00
parent 464e0bcb92
commit 343b453c74
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/copy.c
+13 -3
View File
@@ -31,6 +31,7 @@ struct infix_ds infix_config[] = {
};
static const char *prognm = "copy";
static int timeout;
/*
@@ -157,7 +158,7 @@ static int copy(const char *src, const char *dst, const char *user)
fprintf(stderr, ERRMSG "unable to open transaction to %s\n", dst);
} else {
sr_nacm_set_user(sess, username);
rc = sr_copy_config(sess, NULL, srcds->datastore, 0);
rc = sr_copy_config(sess, NULL, srcds->datastore, timeout * 1000);
if (rc)
emsg(sess, ERRMSG "unable to copy configuration, err %d: %s\n",
rc, sr_strerror(rc));
@@ -314,7 +315,8 @@ static int usage(int rc)
"Options:\n"
" -h This help text\n"
" -u USER Username for remote commands, like scp\n"
" -v Show version\n", prognm);
" -t SEEC Timeout for the operation, or default %d sec\n"
" -v Show version\n", prognm, timeout);
return rc;
}
@@ -324,10 +326,15 @@ int main(int argc, char *argv[])
const char *user = NULL, *src = NULL, *dst = NULL;
int c;
while ((c = getopt(argc, argv, "hu:v")) != EOF) {
timeout = fgetint("/etc/default/confd", "=", "CONFD_TIMEOUT");
while ((c = getopt(argc, argv, "ht:u:v")) != EOF) {
switch(c) {
case 'h':
return usage(0);
case 't':
timeout = atoi(optarg);
break;
case 'u':
user = optarg;
break;
@@ -337,6 +344,9 @@ int main(int argc, char *argv[])
}
}
if (timeout < 0)
timeout = 120;
if (optind >= argc)
return usage(1);