lobo/wttr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #44 from ogarcia/host_port_and_fix

Browse source 
Add host and port configuration and fix unicode decode error
This commit is contained in:
Igor Chubin 2017-02-04 22:57:18 +01:00 • committed by GitHub
commit cfea6b5f29
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/srv.py
View file

@ -20,6 +20,8 @@ app = Flask(__name__)
MYDIR = os.environ.get('WTTR_MYDIR', os.path.abspath(os.path.dirname( os.path.dirname('__file__') )))
GEOLITE = os.environ.get('WTTR_GEOLITE', os.path.join( MYDIR, "GeoLite2-City.mmdb" ))
WEGO = os.environ.get('WTTR_WEGO', "/home/igor/go/bin/wego")
LISTEN_HOST = os.environ.get('WTTR_LISTEN_HOST', "127.0.0.1")
LISTEN_PORT = int(os.environ.get('WTTR_LISTEN_PORT', "8002"))
CACHEDIR = os.path.join( MYDIR, "cache" )
IP2LCACHE = os.path.join( MYDIR, "cache/ip2l" )
@ -104,8 +106,8 @@ def error( text ):
raise RuntimeError(text)
def log( text ):
print text
logging.info( text )
print text.encode('utf-8')
logging.info( text.encode('utf-8') )
def is_ip( ip ):
if re.match('\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}', ip) is None:
@ -254,6 +256,6 @@ def wttr(location = None):
logging.error("Exception has occurred", exc_info=1)
return str(e).rstrip()+"\n"
server = WSGIServer(("", 8002), app)
server = WSGIServer((LISTEN_HOST, LISTEN_PORT), app)
server.serve_forever()