18
18
from cerberus import Validator
19
19
20
20
from ads .opctl import logger , utils
21
- import oci
21
+ from ads . common . oci_logging import OCILog
22
22
23
23
CONTAINER_NETWORK = "CONTAINER_NETWORK"
24
24
@@ -194,40 +194,15 @@ def print_traceback():
194
194
traceback .print_tb (tb )
195
195
196
196
197
- def create_log_in_log_group (signer , log_group_id , log_name = None ):
197
+ def create_log_in_log_group (compartment_id , log_group_id , auth , log_name = None ):
198
198
"""
199
199
Creates a log within a given log group
200
- :param signer: The signer
201
- :param log_group_id: The OCID of the log group.
202
- :param log_name: Name of the log to be created.
203
- :return: Created log id.
204
200
"""
205
-
206
201
if not log_name :
207
202
log_name = f"log-{ int (time .time ())} -{ uuid .uuid4 ()} "
208
- logging_client = oci .logging .LoggingManagementClient (config = {}, signer = signer )
209
-
210
- log_details = oci .logging .models .CreateLogDetails (
211
- display_name = log_name ,
212
- log_type = "CUSTOM" ,
213
- is_enabled = True
214
- )
215
-
216
- response = logging_client .create_log (
217
- log_group_id = log_group_id ,
218
- create_log_details = log_details
219
- )
220
-
221
- wait_for_resource_id = response .headers ['opc-work-request-id' ]
222
- lowered_wait_for_states = ["succeeded" , "failed" ]
223
- try :
224
- waiter_result = oci .wait_until (
225
- logging_client ,
226
- logging_client .get_work_request (wait_for_resource_id ),
227
- evaluate_response = lambda r : getattr (r .data , 'status' )
228
- and getattr (r .data , 'status' ).lower () in lowered_wait_for_states ,
229
- )
230
- log_id = waiter_result .data .resources [0 ].identifier
231
- return log_id
232
- except Exception as e :
233
- raise oci .exceptions .CompositeOperationError (partial_results = [response ], cause = e )
203
+ log = OCILog (display_name = log_name ,
204
+ log_group_id = log_group_id ,
205
+ compartment_id = compartment_id ,
206
+ ** auth ).create ()
207
+ logger .info (f"Created log with log OCID { log .id } " )
208
+ return log .id
0 commit comments