Fossil SCM
Simplify usage of db_setup_server_and_project_codes().
Commit
1b9672ae941b1049d06ecd5f8dcc7677c7806074
Parent
9e888499e1c9fdb…
2 files changed
+1
-1
+1
-1
M
src/db.c
+1
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1328,11 +1328,11 @@ | ||
| 1328 | 1328 | "INSERT INTO config(name,value,mtime)" |
| 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 | - }else{ | |
| 1333 | + }else if( db_is_writeable("repository") ){ | |
| 1334 | 1334 | if( db_get("server-code", 0)==0 ) { |
| 1335 | 1335 | db_multi_exec( |
| 1336 | 1336 | "INSERT INTO config(name,value,mtime)" |
| 1337 | 1337 | " VALUES('server-code', lower(hex(randomblob(20))),now());" |
| 1338 | 1338 | ); |
| 1339 | 1339 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1328,11 +1328,11 @@ | |
| 1328 | "INSERT INTO config(name,value,mtime)" |
| 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_multi_exec( |
| 1336 | "INSERT INTO config(name,value,mtime)" |
| 1337 | " VALUES('server-code', lower(hex(randomblob(20))),now());" |
| 1338 | ); |
| 1339 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1328,11 +1328,11 @@ | |
| 1328 | "INSERT INTO config(name,value,mtime)" |
| 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 if( db_is_writeable("repository") ){ |
| 1334 | if( db_get("server-code", 0)==0 ) { |
| 1335 | db_multi_exec( |
| 1336 | "INSERT INTO config(name,value,mtime)" |
| 1337 | " VALUES('server-code', lower(hex(randomblob(20))),now());" |
| 1338 | ); |
| 1339 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2200,11 +2200,11 @@ | ||
| 2200 | 2200 | }else{ |
| 2201 | 2201 | zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser); |
| 2202 | 2202 | } |
| 2203 | 2203 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2204 | 2204 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2205 | - }else if( g.db ){ | |
| 2205 | + }else{ | |
| 2206 | 2206 | db_setup_server_and_project_codes(1); |
| 2207 | 2207 | } |
| 2208 | 2208 | db_close(1); |
| 2209 | 2209 | if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){ |
| 2210 | 2210 | fossil_fatal("unable to listen on TCP socket %d", iPort); |
| 2211 | 2211 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2200,11 +2200,11 @@ | |
| 2200 | }else{ |
| 2201 | zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser); |
| 2202 | } |
| 2203 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2204 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2205 | }else if( g.db ){ |
| 2206 | db_setup_server_and_project_codes(1); |
| 2207 | } |
| 2208 | db_close(1); |
| 2209 | if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){ |
| 2210 | fossil_fatal("unable to listen on TCP socket %d", iPort); |
| 2211 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2200,11 +2200,11 @@ | |
| 2200 | }else{ |
| 2201 | zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser); |
| 2202 | } |
| 2203 | if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY; |
| 2204 | if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT; |
| 2205 | }else{ |
| 2206 | db_setup_server_and_project_codes(1); |
| 2207 | } |
| 2208 | db_close(1); |
| 2209 | if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){ |
| 2210 | fossil_fatal("unable to listen on TCP socket %d", iPort); |
| 2211 |