mirror
/
py-gitea
kopia lustrzana https://github.com/Langenfeld/py-gitea
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

do not use static logging

pull/3/head
danieldietsch 2019-12-06 16:12:11 +01:00
rodzic 6e51a83320
commit 6b97dbb6e5
1 zmienionych plików z 24 dodań i 29 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

53
gitea/gitea.py
Wyświetl plik

@ -10,9 +10,6 @@ from .basicGiteaApiObject import BasicGiteaApiObject
from .exceptions import * from .exceptions import *
from .giteaApiObject import GiteaApiObject from .giteaApiObject import GiteaApiObject
log = logging.getLogger(__name__)
log.addHandler(logging.NullHandler())
class Organization(GiteaApiObject): class Organization(GiteaApiObject):
GET_API_OBJECT = """/orgs/{name}""" # <org> GET_API_OBJECT = """/orgs/{name}""" # <org>
@ -357,8 +354,10 @@ class Gitea:
CREATE_ORG = """/admin/users/%s/orgs""" # <username> CREATE_ORG = """/admin/users/%s/orgs""" # <username>
CREATE_TEAM = """/orgs/%s/teams""" # <orgname> CREATE_TEAM = """/orgs/%s/teams""" # <orgname>
def __init__(self, gitea_url: str, token_text: str, cached=False): def __init__(self, gitea_url: str, token_text: str, cached=False, log_level="INFO"):
""" Initializing Gitea-instance.""" """ Initializing Gitea-instance."""
self.logger = logging.getLogger()
self.logger.setLevel(log_level)
self.headers = {"Authorization": "token " + token_text, "Content-type": "application/json"} self.headers = {"Authorization": "token " + token_text, "Content-type": "application/json"}
self.url = gitea_url self.url = gitea_url
self.requests = requests.Session() self.requests = requests.Session()
@ -368,7 +367,7 @@ class Gitea:
def __get_url(self, endpoint): def __get_url(self, endpoint):
url = self.url + "/api/v1" + endpoint url = self.url + "/api/v1" + endpoint
logging.debug("Url: %s" % url) self.logger.debug("Url: %s" % url)
return url return url
@staticmethod @staticmethod
@ -385,7 +384,7 @@ class Gitea:
request = requests.get(self.__get_url(endpoint), headers=self.headers, params=params) request = requests.get(self.__get_url(endpoint), headers=self.headers, params=params)
if request.status_code not in [200, 201]: if request.status_code not in [200, 201]:
message = "Received status code: %s (%s)" % (request.status_code, request.url) message = "Received status code: %s (%s)" % (request.status_code, request.url)
logging.error(message) self.logger.error(message)
if request.status_code in [404]: if request.status_code in [404]:
raise NotFoundException() raise NotFoundException()
if request.status_code in [403]: if request.status_code in [403]:
@ -397,14 +396,14 @@ class Gitea:
request = self.requests.put(self.__get_url(endpoint), headers=self.headers) request = self.requests.put(self.__get_url(endpoint), headers=self.headers)
if request.status_code not in [204]: if request.status_code not in [204]:
message = "Received status code: %s (%s) %s" % (request.status_code, request.url, request.text) message = "Received status code: %s (%s) %s" % (request.status_code, request.url, request.text)
logging.error(message) self.logger.error(message)
raise Exception(message) raise Exception(message)
def requests_delete(self, endpoint): def requests_delete(self, endpoint):
request = self.requests.delete(self.__get_url(endpoint), headers=self.headers) request = self.requests.delete(self.__get_url(endpoint), headers=self.headers)
if request.status_code not in [204]: if request.status_code not in [204]:
message = "Received status code: %s (%s)" % (request.status_code, request.url) message = "Received status code: %s (%s)" % (request.status_code, request.url)
logging.error(message) self.logger.error(message)
raise Exception(message) raise Exception(message)
def requests_post(self, endpoint, data): def requests_post(self, endpoint, data):
@ -429,17 +428,12 @@ class Gitea:
"already exists" in request.text "already exists" in request.text
or "e-mail already in use" in request.text or "e-mail already in use" in request.text
): ):
logging.warning(request.text) self.logger.warning(request.text)
raise AlreadyExistsException() raise AlreadyExistsException()
logging.error( self.logger.error("Received status code: %s (%s)" % (request.status_code, request.url))
"Received status code: %s (%s)" % (request.status_code, request.url) self.logger.error("With info: %s (%s)" % (data, self.headers))
) self.logger.error("Answer: %s" % request.text)
logging.error("With info: %s (%s)" % (data, self.headers)) raise Exception("Received status code: %s (%s), %s" % (request.status_code, request.url, request.text))
logging.error("Answer: %s" % request.text)
raise Exception(
"Received status code: %s (%s), %s"
% (request.status_code, request.url, request.text)
)
return self.parse_result(request) return self.parse_result(request)
@ -447,7 +441,7 @@ class Gitea:
request = self.requests.patch(self.__get_url(endpoint), headers=self.headers, data=json.dumps(data)) request = self.requests.patch(self.__get_url(endpoint), headers=self.headers, data=json.dumps(data))
if request.status_code not in [200, 201]: if request.status_code not in [200, 201]:
error_message = "Received status code: %s (%s) %s" % (request.status_code, request.url, data) error_message = "Received status code: %s (%s) %s" % (request.status_code, request.url, data)
logging.error(error_message) self.logger.error(error_message)
raise Exception(error_message) raise Exception(error_message)
return self.parse_result(request) return self.parse_result(request)
@ -582,9 +576,10 @@ class Gitea:
"password": password, "send_notify": sendNotify, "password": password, "send_notify": sendNotify,
"must_change_password": change_pw, }) "must_change_password": change_pw, })
if "id" in result: if "id" in result:
logging.info("Successfully created User %s <%s> (id %s)" % (result["login"], result["email"], result["id"])) self.logger.info(
"Successfully created User %s <%s> (id %s)" % (result["login"], result["email"], result["id"]))
else: else:
logging.error(result["message"]) self.logger.error(result["message"])
raise Exception("User not created... (gitea: %s)" % result["message"]) raise Exception("User not created... (gitea: %s)" % result["message"])
user = User.parse_request(self, result) user = User.parse_request(self, result)
return user return user
@ -606,9 +601,9 @@ class Gitea:
"gitignores": gitignores, "license": license, "gitignores": gitignores, "license": license,
"readme": readme}) "readme": readme})
if "id" in result: if "id" in result:
logging.info("Successfully created Repository %s " % result["name"]) self.logger.info("Successfully created Repository %s " % result["name"])
else: else:
logging.error(result["message"]) self.logger.error(result["message"])
raise Exception("Repository not created... (gitea: %s)" % result["message"]) raise Exception("Repository not created... (gitea: %s)" % result["message"])
return Repository.parse_request(self, result) return Repository.parse_request(self, result)
@ -619,10 +614,10 @@ class Gitea:
data={"username": orgName, "description": description, "location": location, data={"username": orgName, "description": description, "location": location,
"website": website, "full_name": full_name}) "website": website, "full_name": full_name})
if "id" in result: if "id" in result:
logging.info("Successfully created Organization %s" % result["username"]) self.logger.info("Successfully created Organization %s" % result["username"])
else: else:
logging.error("Organization not created... (gitea: %s)" % result["message"]) self.logger.error("Organization not created... (gitea: %s)" % result["message"])
logging.error(result["message"]) self.logger.error(result["message"])
raise Exception( raise Exception(
"Organization not created... (gitea: %s)" % result["message"] "Organization not created... (gitea: %s)" % result["message"]
) )
@ -643,10 +638,10 @@ class Gitea:
Gitea.CREATE_TEAM % org.username, data={"name": name, "description": description, "permission": permission, Gitea.CREATE_TEAM % org.username, data={"name": name, "description": description, "permission": permission,
"units": units}) "units": units})
if "id" in result: if "id" in result:
logging.info("Successfully created Team %s" % result["name"]) self.logger.info("Successfully created Team %s" % result["name"])
else: else:
logging.error("Team not created... (gitea: %s)" % result["message"]) self.logger.error("Team not created... (gitea: %s)" % result["message"])
logging.error(result["message"]) self.logger.error(result["message"])
raise Exception("Team not created... (gitea: %s)" % result["message"]) raise Exception("Team not created... (gitea: %s)" % result["message"])
api_object = Team.parse_request(self, result) api_object = Team.parse_request(self, result)
setattr(api_object, "_organization", setattr(api_object, "_organization",