From 3fcc9adcb5aacb30a0297472a51c308bffd4482b Mon Sep 17 00:00:00 2001 From: leaf corcoran Date: Fri, 16 Mar 2018 00:48:55 -0700 Subject: [PATCH 1/2] disable buffering when starting cqueues server so systemd can capture prints as logs --- lapis/cmd/cqueues.lua | 2 ++ lapis/cmd/cqueues.moon | 3 +++ 2 files changed, 5 insertions(+) diff --git a/lapis/cmd/cqueues.lua b/lapis/cmd/cqueues.lua index 9331099f..a1c58547 100644 --- a/lapis/cmd/cqueues.lua +++ b/lapis/cmd/cqueues.lua @@ -73,6 +73,8 @@ do return self.server:close() end, start = function(self) + io.stdout:setvbuf("no") + io.stderr:setvbuf("no") local logger = require("lapis.logging") local port = select(3, self.server:localname()) local config = require("lapis.config").get() diff --git a/lapis/cmd/cqueues.moon b/lapis/cmd/cqueues.moon index 1b6066c7..87672ad7 100644 --- a/lapis/cmd/cqueues.moon +++ b/lapis/cmd/cqueues.moon @@ -30,6 +30,9 @@ class Server @server\close! start: => + io.stdout\setvbuf "no" + io.stderr\setvbuf "no" + logger = require "lapis.logging" port = select 3, @server\localname! config = require("lapis.config").get! From afc2d00d262cbdca8c7a01b993235a07627d6545 Mon Sep 17 00:00:00 2001 From: DarkWiiPlayer Date: Fri, 16 Mar 2018 16:08:13 +0100 Subject: [PATCH 2/2] Fix for #608 This should fix the problem described in #608 by adding a default parameter to the Model\create method to allow calling it without any arguments. --- lapis/db/mysql/model.lua | 3 +++ lapis/db/mysql/model.moon | 2 +- lapis/db/postgres/model.lua | 3 +++ lapis/db/postgres/model.moon | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lapis/db/mysql/model.lua b/lapis/db/mysql/model.lua index 55bb15e8..eed347db 100644 --- a/lapis/db/mysql/model.lua +++ b/lapis/db/mysql/model.lua @@ -118,6 +118,9 @@ do return columns end self.create = function(self, values, opts) + if values == nil then + values = { } + end if self.constraints then for key in pairs(self.constraints) do do diff --git a/lapis/db/mysql/model.moon b/lapis/db/mysql/model.moon index 7ee3de56..be6f0018 100644 --- a/lapis/db/mysql/model.moon +++ b/lapis/db/mysql/model.moon @@ -15,7 +15,7 @@ class Model extends BaseModel columns -- create from table of values, return loaded object - @create: (values, opts) => + @create: (values={}, opts) => if @constraints for key in pairs @constraints if err = @_check_constraint key, values and values[key], values diff --git a/lapis/db/postgres/model.lua b/lapis/db/postgres/model.lua index 2f71995e..fc762532 100644 --- a/lapis/db/postgres/model.lua +++ b/lapis/db/postgres/model.lua @@ -133,6 +133,9 @@ do local self = _class_0 self.db = db self.create = function(self, values, opts) + if values == nil then + values = { } + end if self.constraints then for key in pairs(self.constraints) do do diff --git a/lapis/db/postgres/model.moon b/lapis/db/postgres/model.moon index 18dc544e..b8f3669a 100644 --- a/lapis/db/postgres/model.moon +++ b/lapis/db/postgres/model.moon @@ -10,7 +10,7 @@ class Model extends BaseModel @db: db -- create from table of values, return loaded object - @create: (values, opts) => + @create: (values={}, opts) => if @constraints for key in pairs @constraints if err = @_check_constraint key, values and values[key], values