Compare commits
	
		
			14 Commits
		
	
	
		
			dev-sync
			...
			dev-prodip
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 2c6ab3d96d | |||
| 2376c1355d | |||
| 93beb10c49 | |||
| 269c08e5de | |||
| 19a74de675 | |||
| 5585574eac | |||
| f8feb40723 | |||
| 0c18cf9bf1 | |||
| 68e2eaffcb | |||
| 3c8229238c | |||
| 0c3161ef03 | |||
| 244b779107 | |||
| b04d0d60d0 | |||
| 735aba20df | 
@@ -9,5 +9,5 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
RUN pip3 install -r requirements.txt
 | 
					RUN pip3 install -r requirements.txt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
EXPOSE 8000
 | 
					EXPOSE 80
 | 
				
			||||||
CMD ["gunicorn", "-b", "0.0.0.0:8000", "app:app"]
 | 
					CMD ["gunicorn", "-b", "0.0.0.0:80", "app:app"]
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,13 @@
 | 
				
			|||||||
 | 
					import json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					from db import redis_client
 | 
				
			||||||
 | 
					from flask import jsonify, current_app
 | 
				
			||||||
from flask_classful import FlaskView
 | 
					from flask_classful import FlaskView
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ConsumersView(FlaskView):
 | 
					class ConsumersView(FlaskView):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def get(self):
 | 
					    def get(self):
 | 
				
			||||||
        return "ConsumersView"
 | 
					        consumer_list = json.loads((redis_client.get("consumer_list") or b"{}").decode('utf-8'))
 | 
				
			||||||
 | 
					        current_app.logger.warning(jsonify([v['ip'] for k, v in consumer_list.items()]))
 | 
				
			||||||
 | 
					        return jsonify([v['ip'] for k, v in consumer_list.items()])
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,31 @@
 | 
				
			|||||||
 | 
					from flask import request, current_app, Response
 | 
				
			||||||
from flask_classful import FlaskView
 | 
					from flask_classful import FlaskView
 | 
				
			||||||
 | 
					from db import redis_client
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class LogView(FlaskView):
 | 
					class LogView(FlaskView):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def get(self):
 | 
					    def post(self):
 | 
				
			||||||
        return "LogView"
 | 
					        # Record the IP address of the producer
 | 
				
			||||||
 | 
					        remote_uuid = request.json['uuid']
 | 
				
			||||||
 | 
					        remote_ip = request.remote_addr
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        prod_key = f"producer_{remote_uuid}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        last_known_remote_ip = redis_client.get(prod_key)
 | 
				
			||||||
 | 
					        if last_known_remote_ip:
 | 
				
			||||||
 | 
					            last_known_remote_ip = last_known_remote_ip.decode('utf-8')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if not last_known_remote_ip:
 | 
				
			||||||
 | 
					            current_app.logger.info(f"New producer {remote_uuid} at {remote_ip}")
 | 
				
			||||||
 | 
					        elif last_known_remote_ip != remote_ip:
 | 
				
			||||||
 | 
					            current_app.logger.info(f"IP address of producer {remote_uuid} have changed: {last_known_remote_ip} -> {remote_ip}")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        # update expirity
 | 
				
			||||||
 | 
					        redis_client.set(prod_key, remote_ip.encode('utf-8'))
 | 
				
			||||||
 | 
					        redis_client.expire(prod_key, 240)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        # print out message
 | 
				
			||||||
 | 
					        current_app.logger.info(f"New message: {request.json['message']}")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return Response(status=204)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user