Skip to content

Commit edb7c02

Browse files
committed
refactor: adding static libraries
1 parent 9b311a7 commit edb7c02

File tree

289 files changed

+169811
-37
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+169811
-37
lines changed

Access/background_task_manager.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ def run_accept_request(data):
300300

301301

302302
def accept_request(user_access_mapping):
303+
result = None
303304
try:
304305
result = run_access_grant.delay(user_access_mapping.request_id)
305306
except Exception:

Access/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,7 @@ def decline_access(self, decline_reason=None):
855855
self.decline_reason = decline_reason
856856
self.save()
857857

858+
@staticmethod
858859
def get_pending_access_mapping(request_id):
859860
return UserAccessMapping.objects.filter(
860861
request_id__contains=request_id, status__in=["Pending", "SecondaryPending"]

Access/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ def _get_request_ids_for_bulk_processing(posted_request_ids, selector):
418418
selector = "groupAccess"
419419
else:
420420
access_request_ids = input_vals
421+
logger.debug("Got the ids %s for bulk processing" % (",".join(access_request_ids)))
421422
return access_request_ids, return_ids, selector
422423

423424

EnigmaAutomation/settings.py

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,15 @@
212212
"PASSWORD": data["database"]["password"],
213213
"HOST": data["database"]["host"],
214214
"PORT": data["database"]["port"],
215-
"OPTIONS": {"auth_plugin": "mysql_native_password"},
215+
'OPTIONS': {
216+
"auth_plugin": "mysql_native_password",
217+
'charset': 'utf8mb4',
218+
}
216219
}
217220
elif data["database"]["engine"] == "sqlite3":
218221
DATABASES["default"] = {
219222
"ENGINE": "django.db.backends.sqlite3",
220-
"NAME": BASE_DIR / "db.sqlite3",
223+
"NAME": BASE_DIR / "db/db.sqlite3",
221224
}
222225
else:
223226
raise Exception("Database engine %s not recognized" % data["database"]["engine"])
@@ -233,6 +236,8 @@
233236

234237
AUTOMATED_EXEC_IDENTIFIER = "automated-grant"
235238

239+
current_log_level = 'DEBUG'
240+
logging_apps = ["django.request", "inventory", "Access", "bootprocess"]
236241
LOGGING = {
237242
'version': 1,
238243
'disable_existing_loggers': False,
@@ -244,41 +249,23 @@
244249
},
245250
'handlers': {
246251
'file': {
247-
'level': 'INFO',
252+
'level': current_log_level,
248253
'class': 'logging.FileHandler',
249254
'filename': './enigma.log',
250255
'formatter': 'verbose',
251256
},
252257
"console": {
253-
"level": "INFO",
258+
"level": current_log_level,
254259
"class": "logging.StreamHandler",
255260
"formatter": "verbose",
256261
},
257262
},
258-
"loggers": {
259-
"django.request": {
260-
"handlers": ["file", "console"],
261-
"level": "INFO",
262-
"propagate": True,
263-
"formatter": "verbose",
264-
},
265-
"inventory": {
266-
"handlers": ["file", "console"],
267-
"level": "INFO",
268-
"propagate": True,
269-
"formatter": "verbose",
270-
},
271-
"Access": {
272-
"handlers": ["file", "console"],
273-
"level": "INFO",
274-
"propagate": True,
275-
"formatter": "verbose",
276-
},
277-
"bootprocess": {
278-
"handlers": ["file", "console"],
279-
"level": "INFO",
280-
"propagate": True,
281-
"formatter": "verbose",
282-
},
283-
},
263+
"loggers": { },
284264
}
265+
for each_app in logging_apps:
266+
LOGGING["loggers"][each_app] = {
267+
"handlers": ["file", "console"],
268+
"level": current_log_level,
269+
"propagate": True,
270+
"formatter": "verbose",
271+
}

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ services:
1111
- ./secrets/ops_app_dev.env
1212
volumes:
1313
- ./mounts/logs/:/ebs/logs/
14+
- ./mounts/db/:/srv/code/dev/db/
1415
ports:
1516
- 8000:8000
1617
depends_on:

static/background.jpg

761 KB
Loading
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "jquery",
3+
"main": "dist/jquery.js",
4+
"license": "MIT",
5+
"ignore": [
6+
"package.json"
7+
],
8+
"keywords": [
9+
"jquery",
10+
"javascript",
11+
"browser",
12+
"library"
13+
],
14+
"homepage": "https://github.com/jquery/jquery-dist",
15+
"version": "3.1.0",
16+
"_release": "3.1.0",
17+
"_resolution": {
18+
"type": "version",
19+
"tag": "3.1.0",
20+
"commit": "6f02bc382c0529d3b4f68f6b2ad21876642dbbfe"
21+
},
22+
"_source": "https://github.com/jquery/jquery-dist.git",
23+
"_target": ">=1.7",
24+
"_originalSource": "jquery"
25+
}

0 commit comments

Comments
 (0)