Fossil SCM
Move the check for "server-code"/"project-code" into the function db_setup_server_and_project_codes()
Commit
35bf2173367c9adbb650464602229a32897daadb
Parent
1dd4be80ca809af…
2 files changed
+12
-8
+1
-1
M
src/db.c
+12
-8
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1329,18 +1329,22 @@ | ||
| 1329 | 1329 | " VALUES('server-code', lower(hex(randomblob(20))),now());" |
| 1330 | 1330 | "INSERT INTO config(name,value,mtime)" |
| 1331 | 1331 | " VALUES('project-code', lower(hex(randomblob(20))),now());" |
| 1332 | 1332 | ); |
| 1333 | 1333 | }else{ |
| 1334 | - db_optional_sql("repository", | |
| 1335 | - "INSERT INTO config(name,value,mtime)" | |
| 1336 | - " VALUES('server-code', lower(hex(randomblob(20))),now());" | |
| 1337 | - ); | |
| 1338 | - db_optional_sql("repository", | |
| 1339 | - "INSERT INTO config(name,value,mtime)" | |
| 1340 | - " VALUES('project-code', lower(hex(randomblob(20))),now());" | |
| 1341 | - ); | |
| 1334 | + if( db_get("server-code", 0)==0 ) { | |
| 1335 | + db_optional_sql("repository", | |
| 1336 | + "INSERT INTO config(name,value,mtime)" | |
| 1337 | + " VALUES('server-code', lower(hex(randomblob(20))),now());" | |
| 1338 | + ); | |
| 1339 | + } | |
| 1340 | + if( db_get("project-code", 0)==0 ) { | |
| 1341 | + db_optional_sql("repository", | |
| 1342 | + "INSERT INTO config(name,value,mtime)" | |
| 1343 | + " VALUES('project-code', lower(hex(randomblob(20))),now());" | |
| 1344 | + ); | |
| 1345 | + } | |
| 1342 | 1346 | } |
| 1343 | 1347 | } |
| 1344 | 1348 | |
| 1345 | 1349 | /* |
| 1346 | 1350 | ** Return a pointer to a string that contains the RHS of an IN operator |
| 1347 | 1351 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1329,18 +1329,22 @@ | |
| 1329 | " VALUES('server-code', lower(hex(randomblob(20))),now());" |
| 1330 | "INSERT INTO config(name,value,mtime)" |
| 1331 | " VALUES('project-code', lower(hex(randomblob(20))),now());" |
| 1332 | ); |
| 1333 | }else{ |
| 1334 | db_optional_sql("repository", |
| 1335 | "INSERT INTO config(name,value,mtime)" |
| 1336 | " VALUES('server-code', lower(hex(randomblob(20))),now());" |
| 1337 | ); |
| 1338 | db_optional_sql("repository", |
| 1339 | "INSERT INTO config(name,value,mtime)" |
| 1340 | " VALUES('project-code', lower(hex(randomblob(20))),now());" |
| 1341 | ); |
| 1342 | } |
| 1343 | } |
| 1344 | |
| 1345 | /* |
| 1346 | ** Return a pointer to a string that contains the RHS of an IN operator |
| 1347 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1329,18 +1329,22 @@ | |
| 1329 | " VALUES('server-code', lower(hex(randomblob(20))),now());" |
| 1330 | "INSERT INTO config(name,value,mtime)" |
| 1331 | " VALUES('project-code', lower(hex(randomblob(20))),now());" |
| 1332 | ); |
| 1333 | }else{ |
| 1334 | if( db_get("server-code", 0)==0 ) { |
| 1335 | db_optional_sql("repository", |
| 1336 | "INSERT INTO config(name,value,mtime)" |
| 1337 | " VALUES('server-code', lower(hex(randomblob(20))),now());" |
| 1338 | ); |
| 1339 | } |
| 1340 | if( db_get("project-code", 0)==0 ) { |
| 1341 | db_optional_sql("repository", |
| 1342 | "INSERT INTO config(name,value,mtime)" |
| 1343 | " VALUES('project-code', lower(hex(randomblob(20))),now());" |
| 1344 | ); |
| 1345 | } |
| 1346 | } |
| 1347 | } |
| 1348 | |
| 1349 | /* |
| 1350 | ** Return a pointer to a string that contains the RHS of an IN operator |
| 1351 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2197,11 +2197,11 @@ | ||
| 2197 | 2197 | }else{ |
| 2198 | 2198 | zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser); |
| 2199 | 2199 | } |
| 2200 | 2200 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2201 | 2201 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2202 | - }else if( db_get("server-code", 0)==0 || db_get("project-code", 0)==0 ){ | |
| 2202 | + }else{ | |
| 2203 | 2203 | db_setup_server_and_project_codes(1); |
| 2204 | 2204 | } |
| 2205 | 2205 | db_close(1); |
| 2206 | 2206 | if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){ |
| 2207 | 2207 | fossil_fatal("unable to listen on TCP socket %d", iPort); |
| 2208 | 2208 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2197,11 +2197,11 @@ | |
| 2197 | }else{ |
| 2198 | zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser); |
| 2199 | } |
| 2200 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2201 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2202 | }else if( db_get("server-code", 0)==0 || db_get("project-code", 0)==0 ){ |
| 2203 | db_setup_server_and_project_codes(1); |
| 2204 | } |
| 2205 | db_close(1); |
| 2206 | if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){ |
| 2207 | fossil_fatal("unable to listen on TCP socket %d", iPort); |
| 2208 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2197,11 +2197,11 @@ | |
| 2197 | }else{ |
| 2198 | zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser); |
| 2199 | } |
| 2200 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2201 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2202 | }else{ |
| 2203 | db_setup_server_and_project_codes(1); |
| 2204 | } |
| 2205 | db_close(1); |
| 2206 | if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){ |
| 2207 | fossil_fatal("unable to listen on TCP socket %d", iPort); |
| 2208 |