mirror of
https://github.com/simon987/sist2.git
synced 2025-12-13 15:29:04 +00:00
Compare commits
5 Commits
sqlite-ind
...
3.0.7
| Author | SHA1 | Date | |
|---|---|---|---|
| cdec1cebc6 | |||
| 0ce341d8e6 | |||
| 7d96d62983 | |||
| 63027dd5ca | |||
|
|
ac942947e4 |
9
.devcontainer/Dockerfile
Normal file
9
.devcontainer/Dockerfile
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
FROM simon987/sist2-build
|
||||||
|
|
||||||
|
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash
|
||||||
|
RUN apt update -y; apt install -y nodejs && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
ENV LANG C.UTF-8
|
||||||
|
ENV LC_ALL C.UTF-8
|
||||||
|
|
||||||
16
.devcontainer/devcontainer.json
Normal file
16
.devcontainer/devcontainer.json
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"name": "sist2-dev",
|
||||||
|
"dockerComposeFile": [
|
||||||
|
"docker-compose.yml"
|
||||||
|
],
|
||||||
|
"service": "sist2-dev",
|
||||||
|
"customizations": {
|
||||||
|
"vscode": {
|
||||||
|
"extensions": [
|
||||||
|
"ms-vscode.cpptools-extension-pack"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"remoteUser": "root",
|
||||||
|
"workspaceFolder": "/app/"
|
||||||
|
}
|
||||||
8
.devcontainer/docker-compose.yml
Normal file
8
.devcontainer/docker-compose.yml
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
version: "3"
|
||||||
|
|
||||||
|
services:
|
||||||
|
sist2-dev:
|
||||||
|
build: .
|
||||||
|
command: sleep infinity
|
||||||
|
volumes:
|
||||||
|
- ../:/app
|
||||||
@@ -46,7 +46,7 @@ class WebOptions(BaseModel):
|
|||||||
super().__init__(**kwargs)
|
super().__init__(**kwargs)
|
||||||
|
|
||||||
def args(self):
|
def args(self):
|
||||||
args = ["web", f"--es-url={self.es_url}", f"--bind={self.bind}",
|
args = ["web", f"--es-url={self.es_url}", f"--es-index={self.es_index}", f"--bind={self.bind}",
|
||||||
f"--tagline={self.tagline}", f"--lang={self.lang}"]
|
f"--tagline={self.tagline}", f"--lang={self.lang}"]
|
||||||
|
|
||||||
if self.auth0_audience:
|
if self.auth0_audience:
|
||||||
|
|||||||
@@ -240,7 +240,10 @@ void print_errors(response_t *r) {
|
|||||||
} else if (errors->valueint != 0) {
|
} else if (errors->valueint != 0) {
|
||||||
cJSON *err;
|
cJSON *err;
|
||||||
cJSON_ArrayForEach(err, cJSON_GetObjectItem(ret_json, "items")) {
|
cJSON_ArrayForEach(err, cJSON_GetObjectItem(ret_json, "items")) {
|
||||||
if (cJSON_GetObjectItem(cJSON_GetObjectItem(err, "index"), "status")->valueint != 201) {
|
|
||||||
|
int status = cJSON_GetObjectItem(cJSON_GetObjectItem(err, "index"), "status")->valueint;
|
||||||
|
|
||||||
|
if (status != 201 && status != 200) {
|
||||||
char *str = cJSON_Print(err);
|
char *str = cJSON_Print(err);
|
||||||
LOG_ERRORF("elastic.c", "%s\n", str);
|
LOG_ERRORF("elastic.c", "%s\n", str);
|
||||||
cJSON_free(str);
|
cJSON_free(str);
|
||||||
|
|||||||
Reference in New Issue
Block a user