##// END OF EJS Templates
radarsys
RSS
Retorno desde el universo borrado previamente, se hace la modificación del pyscopg2 en requirements.txt y comento algunas cosas más de celeery y redis
Renato-TUF -
r365:ae1e52242b94
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,42
1 # Generated by Django 4.1.5 on 2023-01-30 08:51
2
3 from django.db import migrations, models
4 import django.db.models.deletion
5
6
7 class Migration(migrations.Migration):
8
9 initial = True
10
11 dependencies = [
12 ('main', '0001_initial'),
13 ('abs', '0001_initial'),
14 ]
15
16 operations = [
17 migrations.CreateModel(
18 name='ABSConfiguration',
19 fields=[
20 ('configuration_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='main.configuration')),
21 ('active_beam', models.PositiveSmallIntegerField(default=0, verbose_name='Active Beam')),
22 ('module_status', models.CharField(default='0000000000000000000000000000000000000000000000000000000000000000', max_length=10000, verbose_name='Module Status')),
23 ('operation_mode', models.PositiveSmallIntegerField(choices=[(0, 'Manual'), (1, 'Automatic')], default=0, verbose_name='Operation Mode')),
24 ('operation_value', models.FloatField(blank=True, default='10', null=True, verbose_name='Periodic (seconds)')),
25 ('module_messages', models.CharField(default='{"1": "Module 1", "2": "Module 2", "3": "Module 3", "4": "Module 4", "5": "Module 5", "6": "Module 6", "7": "Module 7", "8": "Module 8", "9": "Module 9", "10": "Module 10", "11": "Module 11", "12": "Module 12", "13": "Module 13", "14": "Module 14", "15": "Module 15", "16": "Module 16", "17": "Module 17", "18": "Module 18", "19": "Module 19", "20": "Module 20", "21": "Module 21", "22": "Module 22", "23": "Module 23", "24": "Module 24", "25": "Module 25", "26": "Module 26", "27": "Module 27", "28": "Module 28", "29": "Module 29", "30": "Module 30", "31": "Module 31", "32": "Module 32", "33": "Module 33", "34": "Module 34", "35": "Module 35", "36": "Module 36", "37": "Module 37", "38": "Module 38", "39": "Module 39", "40": "Module 40", "41": "Module 41", "42": "Module 42", "43": "Module 43", "44": "Module 44", "45": "Module 45", "46": "Module 46", "47": "Module 47", "48": "Module 48", "49": "Module 49", "50": "Module 50", "51": "Module 51", "52": "Module 52", "53": "Module 53", "54": "Module 54", "55": "Module 55", "56": "Module 56", "57": "Module 57", "58": "Module 58", "59": "Module 59", "60": "Module 60", "61": "Module 61", "62": "Module 62", "63": "Module 63", "64": "Module 64"}', max_length=10000, verbose_name='Modules Messages')),
26 ],
27 options={
28 'db_table': 'abs_configurations',
29 },
30 bases=('main.configuration',),
31 ),
32 migrations.AddField(
33 model_name='absbeam',
34 name='abs_conf',
35 field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='abs.absconfiguration', verbose_name='ABS Configuration'),
36 ),
37 migrations.AddField(
38 model_name='absactive',
39 name='conf',
40 field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='abs.absconfiguration', verbose_name='ABS Configuration'),
41 ),
42 ]
Show file before | Show file after | Hide comments
@@ -86,18 +86,18 WSGI_APPLICATION = 'radarsys.wsgi.application'
86 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
86 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
87
87
88 DATABASES = {
88 DATABASES = {
89 # 'default': {
90 # 'ENGINE': 'django.db.backends.sqlite3',
91 # 'NAME': 'radarsys.sqlite',
92 # }
89 'default': {
93 'default': {
90 'ENGINE': 'django.db.backends.sqlite3',
94 'ENGINE': 'django.db.backends.postgresql_psycopg2',
91 'NAME': 'radarsys.sqlite',
95 'NAME': os.environ.get('DB_NAME', 'radarsys'),
96 'USER': os.environ.get('DB_USER', 'docker'),
97 'PASSWORD': os.environ.get('DB_PASSWORD', 'docker'),
98 'HOST': os.environ.get('POSTGRES_PORT_5432_TCP_ADDR', 'localhost'),
99 'PORT': os.environ.get('POSTGRES_PORT_5432_TCP_PORT', '5432'),
92 }
100 }
93 # 'default': {
94 # 'ENGINE': 'django.db.backends.postgresql_psycopg2',
95 # 'NAME': os.environ.get('DB_NAME', 'radarsys'),
96 # 'USER': os.environ.get('DB_USER', 'docker'),
97 # 'PASSWORD': os.environ.get('DB_PASSWORD', 'docker'),
98 # 'HOST': os.environ.get('POSTGRES_PORT_5432_TCP_ADDR', 'localhost'),
99 # 'PORT': os.environ.get('POSTGRES_PORT_5432_TCP_PORT', '5400'),
100 #}
101 }
101 }
102
102
103 # Internationalization
103 # Internationalization
@@ -132,23 +132,23 STATICFILES_FINDERS = (
132 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
132 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
133 )
133 )
134
134
135 # Celery stuff
135 # # Celery stuff
136
136
137 REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost')
137 # REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost')
138 #REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1')
138 # #REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1')
139 REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
139 # REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
140
140
141 BROKER_TRANSPORT = 'redis'
141 # BROKER_TRANSPORT = 'redis'
142 #BROKER_URL = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
142 # #BROKER_URL = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
143 BROKER_URL = 'redis://{}:{}'.format(REDIS_HOST, REDIS_PORT)
143 # BROKER_URL = 'redis://{}:{}'.format(REDIS_HOST, REDIS_PORT)
144
144
145 CELERY_RESULT_BACKEND = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
145 # CELERY_RESULT_BACKEND = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
146 CELERY_BROKER_TRANSPORT = BROKER_URL
146 # CELERY_BROKER_TRANSPORT = BROKER_URL
147 CELERY_ACCEPT_CONTENT = ['application/json']
147 # CELERY_ACCEPT_CONTENT = ['application/json']
148 CELERY_TASK_SERIALIZER = 'json'
148 # CELERY_TASK_SERIALIZER = 'json'
149 CELERY_RESULT_SERIALIZER = 'json'
149 # CELERY_RESULT_SERIALIZER = 'json'
150 CELERY_ENABLE_UTC = False
150 # CELERY_ENABLE_UTC = False
151 CELERY_TIMEZONE = 'America/Lima'
151 # CELERY_TIMEZONE = 'America/Lima'
152
152
153 import django
153 import django
154 from django.utils.encoding import force_str
154 from django.utils.encoding import force_str
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 Django==4.1.5
1 Django==4.1.5
2 django-bootstrap5==22.2
2 django-bootstrap5==22.2
3 psycopg[binary]==3.1.8
3 psycopg2-binary==2.9.5
4 django-polymorphic==3.1
4 django-polymorphic==3.1
5 bokeh==3.0.3
5 bokeh==3.0.3
6 numpy==1.24.1
6 numpy==1.24.1
General Comments 0
You need to be logged in to leave comments. Login now