notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

small tweak.

Browse Source
This commit is contained in:
Bryce Covert
2022-09-17 08:16:36 -07:00
parent 4bcb2b7c53
commit 7e23b1e89a
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/clj/auto_ap/jobs/square.clj
View File

@@ -5,14 +5,14 @@
[mount.core :as mount] [mount.core :as mount]
[auto-ap.datomic :refer [conn]] [auto-ap.datomic :refer [conn]]
[clojure.tools.logging :as log] [clojure.tools.logging :as log]
[auto-ap.background.metrics :refer [metrics-setup]] [auto-ap.background.metrics :refer [metrics-setup container-tags logging-context]]
[unilog.context :as lc])) [unilog.context :as lc]))
(defn -main [& _] (defn -main [& _]
(lc/with-context {:background-job "square-loading-new"} (lc/with-context {:background-job "square-loading-new"}
(mount/start (mount/only #{#'conn #'metrics-setup})) (mount/start (mount/only #{#'conn #'metrics-setup #'container-tags #'logging-context}))
((heartbeat square/upsert-all "square-loading")) ((heartbeat square/upsert-all "square-loading"))
(mount/stop (mount/only #{#'conn #'metrics-setup})) (mount/stop )
(log/info "Stopping Square loading") (log/info "Stopping Square loading")
(System/exit 0))) (System/exit 0)))

3
terraform/deploy.tf
View File

@@ -356,7 +356,8 @@ resource "aws_cloudwatch_event_target" "square_import_job_target" {
{ {
"name": "integreat-app", "name": "integreat-app",
"environment": [{"name": "INTEGREAT_JOB", "value": "square-import-job"}, "environment": [{"name": "INTEGREAT_JOB", "value": "square-import-job"},
{"name": "DD_CONTAINER_ENV_AS_TAGS", "value":"{\"INTEGREAT_JOB\":\"background_job\"}"}] {"name": "DD_CONTAINER_ENV_AS_TAGS", "value":"{\"INTEGREAT_JOB\":\"background_job\"}"},
{"name": "DD_SERVICE", "value": "square-import-job"}]
} }
] ]
} }

8
terraform/terraform.tfstate.d/prod/terraform.tfstate
View File

@@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "1.2.7", "terraform_version": "1.2.7",
"serial": 123, "serial": 141,
"lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51", "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51",
"outputs": { "outputs": {
"aws_access_key_id": { "aws_access_key_id": {
@@ -153,7 +153,7 @@
"event_bus_name": "default", "event_bus_name": "default",
"http_target": [], "http_target": [],
"id": "square-import-job-schedule-square-import-job", "id": "square-import-job-schedule-square-import-job",
"input": "{\n \"containerOverrides\": [\n {\n \"name\": \"integreat-app\",\n \"environment\": [{\"name\": \"INTEGREAT_JOB\", \"value\": \"square-import-job\"},\n {\"name\": \"DD_CONTAINER_ENV_AS_TAGS\", \"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"background_job\\\"}\"}]\n }\n ]\n}\n", "input": "{\n \"containerOverrides\": [\n {\n \"name\": \"integreat-app\",\n \"environment\": [{\"name\": \"INTEGREAT_JOB\", \"value\": \"square-import-job\"},\n {\"name\": \"DD_CONTAINER_ENV_AS_TAGS\", \"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"background_job\\\"}\"},\n {\"name\": \"DD_SERVICE\", \"value\": \"square-import-job\"}]\n }\n ]\n}\n",
"input_path": "", "input_path": "",
"input_transformer": [], "input_transformer": [],
"kinesis_target": [], "kinesis_target": [],
@@ -255,7 +255,7 @@
], ],
"tags": {}, "tags": {},
"tags_all": {}, "tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:355", "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:356",
"timeouts": { "timeouts": {
"delete": null "delete": null
}, },
@@ -334,7 +334,7 @@
], ],
"tags": {}, "tags": {},
"tags_all": {}, "tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:333", "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:334",
"timeouts": { "timeouts": {
"delete": null "delete": null
}, },

10
terraform/terraform.tfstate.d/prod/terraform.tfstate.backup
View File

@@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "1.2.7", "terraform_version": "1.2.7",
"serial": 121, "serial": 139,
"lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51", "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51",
"outputs": { "outputs": {
"aws_access_key_id": { "aws_access_key_id": {
@@ -101,7 +101,7 @@
"name": "square-import-job-schedule", "name": "square-import-job-schedule",
"name_prefix": "", "name_prefix": "",
"role_arn": "", "role_arn": "",
"schedule_expression": "rate(4 hours)", "schedule_expression": "cron(06 * * * ? *)",
"tags": {}, "tags": {},
"tags_all": {} "tags_all": {}
}, },
@@ -153,7 +153,7 @@
"event_bus_name": "default", "event_bus_name": "default",
"http_target": [], "http_target": [],
"id": "square-import-job-schedule-square-import-job", "id": "square-import-job-schedule-square-import-job",
"input": "{\n \"containerOverrides\": [\n {\n \"name\": \"integreat-app\",\n \"environment\": [{\"name\": \"INTEGREAT_JOB\", \"value\": \"square-import-job\"},\n {\"name\": \"DD_SERVICE\", \"value\": \"square-import-job\"},\n {\"name\": \"DD_CONTAINER_ENV_AS_TAGS\", \"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"task_family\\\"}\"}] \n }\n ]\n}\n", "input": "{\n \"containerOverrides\": [\n {\n \"name\": \"integreat-app\",\n \"environment\": [{\"name\": \"INTEGREAT_JOB\", \"value\": \"square-import-job\"},\n {\"name\": \"DD_CONTAINER_ENV_AS_TAGS\", \"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"background_job\\\"}\"},\n {\"name\": \"DD_SERVICE\", \"value\": \"square-import-job\"}]\n }\n ]\n}\n",
"input_path": "", "input_path": "",
"input_transformer": [], "input_transformer": [],
"kinesis_target": [], "kinesis_target": [],
@@ -255,7 +255,7 @@
], ],
"tags": {}, "tags": {},
"tags_all": {}, "tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:354", "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:356",
"timeouts": { "timeouts": {
"delete": null "delete": null
}, },
@@ -334,7 +334,7 @@
], ],
"tags": {}, "tags": {},
"tags_all": {}, "tags_all": {},
"task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:332", "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_background-worker_prod:334",
"timeouts": { "timeouts": {
"delete": null "delete": null
}, },