Mercurial Hosting > luan
changeset 2029:5fa5a7efc936 default tip
merge
| author | Violet7 |
|---|---|
| date | Thu, 30 Oct 2025 21:25:37 -0700 |
| parents | 2f43f84191c9 (current diff) 8c5b604f98cd (diff) |
| children | |
| files | |
| diffstat | 10 files changed, 63 insertions(+), 64 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/backup/backup_server.luan Thu Oct 30 21:25:37 2025 -0700 @@ -0,0 +1,50 @@ +local Luan = require "luan:Luan.luan" +local error = Luan.error +local ipairs = Luan.ipairs or error() +local Io = require "luan:Io.luan" + +require "java" +local File = require "java:java.io.File" +local BackupServer = require "java:goodjava.lucene.backup.BackupServer" + +local log_to_console = false +for _, arg in ipairs{...} do + if arg == "console" then + log_to_console = true + end +end +if not log_to_console then + local FileWriter = require "java:java.io.FileWriter" + local LuanLogger = require "java:luan.modules.logging.LuanLogger" + local Layouts = require "java:goodjava.logger.Layouts" + local DateLayout = require "java:goodjava.logger.DateLayout" + local ListLayout = require "java:goodjava.logger.ListLayout" + local Level = require "java:goodjava.logger.Level" + local WriterAppender = require "java:goodjava.logger.WriterAppender" + local LevelAppender = require "java:goodjava.logger.LevelAppender" + local ListAppender = require "java:goodjava.logger.ListAppender" + + local layout = ListLayout.new(DateLayout.new("yyyy-MM-dd HH:mm:ss,SSS")," ",Layouts.LEVEL_PADDED," ",Layouts.LOGGER," - ",Layouts.MESSAGE,"\n",Layouts.THROWABLE) + + local function new_appender(file,level) + local writer = FileWriter.new(file,true) + local appender = WriterAppender.new(layout,writer) + appender = LevelAppender.new(appender,level) + return appender + end + + Io.uri("file:logs").mkdir() + local err = new_appender("logs/error.log",Level.ERROR) + local warn = new_appender("logs/warn.log",Level.WARN) + local info = new_appender("logs/info.log",Level.INFO) + local appender = ListAppender.new(err,warn,info) + LuanLogger.configure(appender) +end + +local Logging = require "luan:logging/Logging.luan" +local logger = Logging.logger "backup_server" +logger.info("log_to_console "..log_to_console) + +local dir = File.new("backups") +local server = BackupServer.new(dir) +server.start()
--- a/backup/server.luan Thu Oct 30 21:22:03 2025 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -local Luan = require "luan:Luan.luan" -local error = Luan.error -local ipairs = Luan.ipairs or error() -local Io = require "luan:Io.luan" - -require "java" -local File = require "java:java.io.File" -local BackupServer = require "java:goodjava.lucene.backup.BackupServer" -local Logging = require "luan:logging/Logging.luan" - -local log_to_console = false -for _, arg in ipairs{...} do - if arg == "console" then - log_to_console = true - end -end -if not log_to_console then - local FileWriter = require "java:java.io.FileWriter" - local LuanLogger = require "java:luan.modules.logging.LuanLogger" - local Layouts = require "java:goodjava.logger.Layouts" - local DateLayout = require "java:goodjava.logger.DateLayout" - local ListLayout = require "java:goodjava.logger.ListLayout" - local Level = require "java:goodjava.logger.Level" - local WriterAppender = require "java:goodjava.logger.WriterAppender" - local LevelAppender = require "java:goodjava.logger.LevelAppender" - local ListAppender = require "java:goodjava.logger.ListAppender" - - local layout = ListLayout.new(DateLayout.new("yyyy-MM-dd HH:mm:ss,SSS")," ",Layouts.LEVEL_PADDED," ",Layouts.LOGGER," - ",Layouts.MESSAGE,"\n",Layouts.THROWABLE) - - local function new_appender(file,level) - local writer = FileWriter.new(file,true) - local appender = WriterAppender.new(layout,writer) - appender = LevelAppender.new(appender,level) - return appender - end - - Io.uri("file:logs").mkdir() - local err = new_appender("logs/error.log",Level.ERROR) - local warn = new_appender("logs/warn.log",Level.WARN) - local info = new_appender("logs/info.log",Level.INFO) - local appender = ListAppender.new(err,warn,info) - LuanLogger.configure(appender) -end - -local dir = File.new("backups") -local server = BackupServer.new(dir) -server.start()
--- a/backup/start.sh Thu Oct 30 21:22:03 2025 -0700 +++ b/backup/start.sh Thu Oct 30 21:25:37 2025 -0700 @@ -5,7 +5,7 @@ servelog=${logsdir}"/server.log"; if [ "$1" == "launchd" ]; then - ${ROOTPWD}/luan.sh server.luan $* &2>${servelog} + ${ROOTPWD}/luan.sh backup_server.luan $* &2>${servelog} else - ${ROOTPWD}/luan.sh server.luan $* &2>${servelog}& + ${ROOTPWD}/luan.sh backup_server.luan $* &2>${servelog}& fi;
--- a/backup/stop.sh Thu Oct 30 21:22:03 2025 -0700 +++ b/backup/stop.sh Thu Oct 30 21:25:37 2025 -0700 @@ -1,5 +1,5 @@ #!/bin/bash -LUAN_PIDS=$(ps ax | awk '{if($0~"[s]erver.luan"){print $1}}'); +LUAN_PIDS=$(ps ax | awk '{if($0~"(backup_)?[s]erver.luan"){print $1}}'); kill -TERM $LUAN_PIDS; exit 0;
--- a/host/check_app.sh Thu Oct 30 21:22:03 2025 -0700 +++ b/host/check_app.sh Thu Oct 30 21:25:37 2025 -0700 @@ -3,7 +3,7 @@ export PATH="$PATH:/usr/local/bin"; function getPids() { - PIDS=$(ps ax | awk '{if($0~"[r]un.luan"){print $1}}'); + PIDS=$(ps ax | awk '{if($0~"[r]un(_host)?.luan"){print $1}}'); } function checkStopped() {
--- a/host/run.luan Thu Oct 30 21:22:03 2025 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -local Luan = require "luan:Luan.luan" -Luan.load_file("classpath:luan/host/run.luan")(...)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host/run_host.luan Thu Oct 30 21:25:37 2025 -0700 @@ -0,0 +1,2 @@ +local Luan = require "luan:Luan.luan" +Luan.load_file("classpath:luan/host/run.luan")(...)
--- a/host/serve.sh Thu Oct 30 21:22:03 2025 -0700 +++ b/host/serve.sh Thu Oct 30 21:25:37 2025 -0700 @@ -1,9 +1,8 @@ #!/bin/bash - set -e . check_app.sh checkStopped; -luan run.luan console 2>&1 | tee err +luan run_host.luan console 2>&1 | tee err
--- a/host/serve_dev.sh Thu Oct 30 21:22:03 2025 -0700 +++ b/host/serve_dev.sh Thu Oct 30 21:25:37 2025 -0700 @@ -1,9 +1,8 @@ #!/bin/bash - set -e . check_app.sh checkStopped; -java -classpath $CLASSPATH luan.Luan run.luan console 2>&1 | tee err +java -classpath $CLASSPATH luan.Luan run_host.luan console 2>&1 | tee err
--- a/host/start.sh Thu Oct 30 21:22:03 2025 -0700 +++ b/host/start.sh Thu Oct 30 21:25:37 2025 -0700 @@ -1,11 +1,6 @@ #!/bin/bash - set -e -#seconds to wait -toWait=10; -i=0; - . check_app.sh; checkStopped; @@ -16,12 +11,15 @@ touch started.lock; sudo $(which nginx) -c $(pwd)/local/nginx.conf; if [ "$1" == "launchd" ]; then - java -Xms1024M -classpath $CLASSPATH luan.Luan run.luan logs 1>logs/stdout.log 2>logs/stderr.log + java -Xms1024M -classpath $CLASSPATH luan.Luan run_host.luan logs 1>logs/stdout.log 2>logs/stderr.log else - java -Xms1024M -classpath $CLASSPATH luan.Luan run.luan logs 1>logs/stdout.log 2>logs/stderr.log & + java -Xms1024M -classpath $CLASSPATH luan.Luan run_host.luan logs 1>logs/stdout.log 2>logs/stderr.log & getPids; if [ "$PIDS" == "" ]; then + #seconds to wait + toWait=10; + i=0; while [ $i -lt $toWait ]; do sleep 1; getPids;