Consolidate all server library code into one file and simplify a few …

…things
aw · Jul 31, 2020 · 6e293f1 · 6e293f1
1 parent c79a6bd
commit 6e293f1
Show file tree

Hide file tree

Showing 11 changed files with 544 additions and 550 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.15.0 (2020-07-31)
+
+  * Consolidate all server library code into one file: libkv.l
+  * Fix loading of module.l
+  * Simplify storage location and settings for temporary/lock files
+  * Explicitly make the child exit when it's finished processing
+
 ## 0.14.2 (2020-07-30)
 
   * Ensure clients actually exit when a 'CLIENT KILL' command is received

diff --git a/README.md b/README.md
@@ -364,7 +364,7 @@ Here we'll assume persistence was previously enabled and data has already been w
   7. When a `BGSAVE` (non-blocking) command is received, a temporay copy of the AOF is made, the current AOF is wiped, and a background process is forked to save the DB to disk
   8. When a `SAVE` (blocking) command is received, the in-memory DB is saved to disk and the AOF is wiped.
   9. A backup of the DB file is always made before overwriting the current DB file.
-  10. To help handle concurrency and persistence, temporary files are named `.kv.db.lock`, `.kv.db.tmp`, `.kv.aof.lock`, and `.kv.aof.tmp`. It's best not to modify or delete those files while the server is running. They can be safely removed while the server is stopped.
+  10. To help handle concurrency and persistence, temporary files are named `kv.db.lock`, `kv.db.tmp`, `kv.aof.lock`, and `kv.aof.tmp`. It's best not to modify or delete those files while the server is running. They can be safely removed while the server is stopped.
 
 ## AOF format
 
@@ -394,7 +394,7 @@ When replaying the AOF, the server will ensure the hash of command and arguments
 
 ## DB format
 
-The DB is stored by default in the `kv.db` file as defined by `*KV_db`. When backed up, it is named `.kv.db.old`.
+The DB is stored by default in the `kv.db` file as defined by `*KV_db`. When backed up, the new filename contains the suffix `.old`.
 
 Here are two separate entries in a typical DB:
 

diff --git a/child.l b/child.l
diff --git a/client.l b/client.l
@@ -35,7 +35,7 @@
                ("  SAVE"                              "^I^ISAVE")
                ("  SET key value"                     "^I^ISET mykey hello") ]
 
-(chdir (car (file)) (load "libkvclient.l" "clihelpers.l"))
+(chdir (car (file)) (load "libkvclient.l" "clihelpers.l" "module.l"))
 
 # START
 [ifn  (argv)

diff --git a/commands.l b/commands.l