comparison: src/server/daemon/configmanager.c
src/server/daemon/configmanager.c
- changeset 62
- c47e081b6c0f
- parent 61
- c858850f3d3a
- child 69
- 4a10bc0ee80d
equal
deleted
inserted
replaced
| 61:c858850f3d3a | 62:c47e081b6c0f |
|---|---|
| 138 perror("stat(\"config/server.conf\")"); | 138 perror("stat(\"config/server.conf\")"); |
| 139 return -1; | 139 return -1; |
| 140 } | 140 } |
| 141 | 141 |
| 142 ServerConfiguration *config; | 142 ServerConfiguration *config; |
| 143 if(sc_last_modified != s.st_mtim.tv_sec) { | 143 //if(sc_last_modified != s.st_mtim.tv_sec) { |
| 144 if(cfgreload || !current_config) { | |
| 144 printf("cfgmgr load server.conf\n"); | 145 printf("cfgmgr load server.conf\n"); |
| 145 config = load_server_conf( | 146 config = load_server_conf( |
| 146 current_config, | 147 current_config, |
| 147 "config/server.conf"); | 148 "config/server.conf"); |
| 148 | 149 |
| 150 fprintf(stderr, "Cannot load server.conf\n"); | 151 fprintf(stderr, "Cannot load server.conf\n"); |
| 151 return -1; | 152 return -1; |
| 152 } | 153 } |
| 153 | 154 |
| 154 sc_last_modified = s.st_mtim.tv_sec; | 155 sc_last_modified = s.st_mtim.tv_sec; |
| 155 } else if(cfgreload) { | 156 } else if(0) { |
| 156 /* copy configuration */ | 157 /* copy configuration */ |
| 157 printf("cfgmgr copy server.conf\n"); | 158 printf("cfgmgr copy server.conf\n"); |
| 158 | 159 |
| 159 /* TODO: copy */ | 160 /* TODO: copy */ |
| 160 /* | 161 /* |
