projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wait longer (30 seconds instead of 10) to connect to Citadel server when running...
[citadel.git]
/
citadel
/
utils
/
setup.c
diff --git
a/citadel/utils/setup.c
b/citadel/utils/setup.c
index 0d6d7c03227c027448fb3852891ac2dbb1f7d985..6eaa957d3d4829c46262adbb39ab49ae186a8bc7 100644
(file)
--- a/
citadel/utils/setup.c
+++ b/
citadel/utils/setup.c
@@
-1,7
+1,7
@@
/*
* Citadel setup utility
*
/*
* Citadel setup utility
*
- * Copyright (c) 1987-201
5
by the citadel.org team
+ * Copyright (c) 1987-201
6
by the citadel.org team
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 3.
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 3.
@@
-1075,7
+1075,6
@@
int main(int argc, char *argv[])
char aaa[128];
int relh = 0;
int home = 0;
char aaa[128];
int relh = 0;
int home = 0;
- int nRetries = 0;
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
struct passwd *pw;
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
struct passwd *pw;
@@
-1131,12
+1130,14
@@
int main(int argc, char *argv[])
/*
* Connect to the running Citadel server.
*/
/*
* Connect to the running Citadel server.
*/
- while ((serv_sock < 0) && (nRetries < 10)) {
+ char *connectingmsg = _("Connecting to Citadel server");
+ for (i=0; ((i<30) && (serv_sock < 0)) ; ++i) { /* wait for server to start up */
+ progress(connectingmsg, i, 30);
serv_sock = uds_connectsock(file_citadel_admin_socket);
serv_sock = uds_connectsock(file_citadel_admin_socket);
- nRetries ++;
- if (serv_sock < 0)
- sleep(1);
+ sleep(1);
}
}
+ progress(connectingmsg, 30, 30);
+
if (serv_sock < 0) {
display_error(
"%s: %s %s\n",
if (serv_sock < 0) {
display_error(
"%s: %s %s\n",