[FIX] hw_scanner: start scanner thread on first use to prevent start during unit tests
bzr revid: fva@openerp.com-20140123180138-1g342p7y2aiakr76
This commit is contained in:
parent
a656cc07ef
commit
fe5b70fa52
|
@ -175,16 +175,18 @@ class Scanner(Thread):
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
_logger.error('Could not read Barcode Scanner Events:\n Exception: '+str(e))
|
_logger.error('Could not read Barcode Scanner Events:\n Exception: '+str(e))
|
||||||
|
|
||||||
if not openerp.tools.config["stop_after_init"]:
|
s = Scanner()
|
||||||
s = Scanner()
|
|
||||||
s.start()
|
|
||||||
|
|
||||||
class ScannerDriver(hw_proxy.Proxy):
|
class ScannerDriver(hw_proxy.Proxy):
|
||||||
@http.route('/hw_proxy/is_scanner_connected', type='json', auth='admin')
|
@http.route('/hw_proxy/is_scanner_connected', type='json', auth='admin')
|
||||||
def is_scanner_connected(self):
|
def is_scanner_connected(self):
|
||||||
|
if not s.isAlive():
|
||||||
|
s.start()
|
||||||
return s.get_device() != None
|
return s.get_device() != None
|
||||||
|
|
||||||
@http.route('/hw_proxy/scanner', type='json', auth='admin')
|
@http.route('/hw_proxy/scanner', type='json', auth='admin')
|
||||||
def scanner(self):
|
def scanner(self):
|
||||||
|
if not s.isAlive():
|
||||||
|
s.start()
|
||||||
return s.get_barcode()
|
return s.get_barcode()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue