Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions connector_magento/components/backend_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
import socket
import logging
import requests
from requests.compat import json
from urllib.parse import quote_plus
import xmlrpc.client

from odoo.addons.component.core import AbstractComponent
from odoo.addons.queue_job.exception import RetryableJobError
from odoo.addons.connector.exception import NetworkRetryableError
from odoo.addons.connector_magento.exception import MagentoError
from datetime import datetime

_logger = logging.getLogger(__name__)
Expand All @@ -19,7 +21,6 @@
except ImportError:
_logger.debug("Cannot import 'magento'")


MAGENTO_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'


Expand Down Expand Up @@ -153,9 +154,19 @@ def call(self, method, arguments, http_method=None, storeview=None):
# record(method, arguments, result)
return result
except (socket.gaierror, socket.error, socket.timeout) as err:
if err.response is not None:
try:
response_message = err.response.json()
raise MagentoError(
('An error caused the failure of the job %s: %s' % (err, response_message['message'])),
json=response_message
)
except json.decoder.JSONDecodeError:
pass
raise NetworkRetryableError(
'A network error caused the failure of the job: '
'%s' % err)
'A network error caused the failure of the job: %s'
% err
)
except xmlrpc.client.ProtocolError as err:
if err.errcode in [502, # Bad gateway
503, # Service unavailable
Expand Down
11 changes: 11 additions & 0 deletions connector_magento/exception.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,14 @@

class OrderImportRuleRetry(RetryableJobError):
""" The sale order import will be retried later. """


class MagentoError(Exception):
"""Catch Json Error
Attributes:
json -- Catching the json error explanation of the failed job
"""

def __init__(self, msg, json):
super().__init__(msg)
self.json = json