update readme

Author: root

README.md

@@ -194,6 +194,41 @@ print(watcher.url)
 print(watcher.thread_name)              
 ```
 
+more flexible watcher:
+
+when use this kind of function, you can deal with the original json-object. And you can give some extra params.
+
+```python
+def deal_watch(*args):
+    # "jsonObj" must be one of the params in function "deal"
+    def deal(jsonObj=None,args=args):
+        # define your deal process
+        print(dictToJsonString(jsonObj)[:20])
+
+    return deal
+
+watcher = client.watchResourceBase(kind="Pod", namespace="default", handlerFunction=deal_watch())
+print(watcher.url)
+```
+
+Advanced usage:
+
+If you want to add more request restrictions, such as "limit","continue","fieldSelector" and so on, you can simply give them to the python-function-params. For example:
+
+```python
+def deal_watch(*args):
+    # "jsonObj" must be one of the params in function "deal"
+    def deal(jsonObj=None,args=args):
+        # define your deal process
+        print(dictToJsonString(jsonObj)[:20])
+
+    return deal
+
+# set http_params as timeoutSeconds=3 & limit=1
+watcher = client.watchResourceBase(kind="Pod", namespace="default", handlerFunction=deal_watch(),timeoutSeconds="3",limit="1")
+print(watcher.url)
+```
+
 **the watcher will be close automatically when the main thead exit. If this is not your aim, you can set the param by `is_daemon=False`**
 
 get how much watcher is running:
@@ -245,16 +280,13 @@ from kubesys.common import goodPrintDict
 
 print(goodPrintDict(response_dict))
 ```
-
-
-
 ## full-example
 
 see the result in [run-outputs](/out.txt)
 
 ```python
 from kubesys.client import KubernetesClient
-from kubesys.common import dictToJsonString, getActiveThreadCount
+from kubesys.common import dictToJsonString, getActiveThreadCount,goodPrintDict
 from kubesys.watch_handler import WatchHandler
 import time
 # import kubesys
@@ -290,48 +322,60 @@ def test_CRUD(client):
     print("--test list resources:")
     response_dict,OK,http_status_code = client.listResources("Pod")
     # print("response_dict: %s"%(goodPrintDict(response_dict,show_print=False)))
-    # print("is OK: ", OK)
-    # print("HTTP status code: ", http_status_code,"\n")
+    print("is OK: ", OK)
+    print("HTTP status code: ", http_status_code,"\n")
 
     # test create resources
     print("--test create resources:")
     response_dict,OK,http_status_code = client.createResource(pod_json)
     # print("response_dict: %s"%(goodPrintDict(response_dict,show_print=False)))
-    # print("is OK: ", OK)
-    # print("HTTP status code: ", http_status_code,"\n")
+    print("is OK: ", OK)
+    print("HTTP status code: ", http_status_code,"\n")
 
     # test get one single Resources
     print("--test get one single Resources")
     response_dict,OK,http_status_code = client.getResource(kind="Pod", namespace="default", name="busybox")
     # print("response_dict: %s"%(goodPrintDict(response_dict,show_print=False)))
-    # print("is OK: ", OK)
-    # print("HTTP status code: ", http_status_code,"\n")
+    print("is OK: ", OK)
+    print("HTTP status code: ", http_status_code,"\n")
 
     # test delete pod
     print("--test delete pod:")
     response_dict,OK,http_status_code = client.deleteResource(kind="Pod", namespace="default", name="busybox")
     # print("response_dict: %s"%(goodPrintDict(response_dict,show_print=False)))
-    # print("is OK: ", OK)
-    # print("HTTP status code: ", http_status_code,"\n")
+    print("is OK: ", OK)
+    print("HTTP status code: ", http_status_code,"\n")
 
 def test_watcher(client,namespce,kind,name=None):
     print("--start to watch...")
     # client.watchResource(kind="Pod", namespace="default", name="busybox",watcherhandler=WatchHandler(add_func = lambda json_dict: print("ADDED: ", dictToJsonString(json_dict)), modify_func = lambda json_dict: print("MODIFIED: ", dictToJsonString(json_dict)),delete_func = lambda json_dict: print("DELETED: ", dictToJsonString(json_dict))))
-    watcher = client.watchResource(kind=kind, namespace=namespce, name=name,watcherhandler=WatchHandler(add_func = lambda json_dict: print(kind,"-ADDED: ",dictToJsonString(json_dict)[:20]), modify_func = lambda json_dict: print(kind,"-MODIFIED: ",dictToJsonString(json_dict)[:20]),delete_func = lambda json_dict: print(kind,"-DELETED: ",dictToJsonString(json_dict)[:20])))
+    watcher = client.watchResource(kind=kind, namespace=namespce, name=name,watcherhandler=WatchHandler(add_func = lambda json_dict: print(kind,"ADDED ",dictToJsonString(json_dict)[:20]), modify_func = lambda json_dict: print(kind,"MODIFIED ",dictToJsonString(json_dict)[:20]),delete_func = lambda json_dict: print(kind,"DELETED ",dictToJsonString(json_dict)[:20])))
+    print(watcher.url)
+
+def deal_watch(*args):
+    def tt(jsonObj=None,args=args):
+        print(dictToJsonString(jsonObj)[:20])
+
+    return tt
+
+def test_watcher_base(client,namespce,kind,name=None,handlerFunction=None,**kwargs):
+    print("--start to watch...")
+    # client.watchResource(kind="Pod", namespace="default", name="busybox",watcherhandler=WatchHandler(add_func = lambda json_dict: print("ADDED: ", dictToJsonString(json_dict)), modify_func = lambda json_dict: print("MODIFIED: ", dictToJsonString(json_dict)),delete_func = lambda json_dict: print("DELETED: ", dictToJsonString(json_dict))))
+    watcher = client.watchResourceBase(kind=kind, namespace=namespce, name=name,handlerFunction=handlerFunction,**kwargs)
     print(watcher.url)
 
 def main():
     url = ""
     token = ""
 
     client = KubernetesClient(url=url,token=token)
-    test_watcher(client,"default","DaemonSet")
-    test_watcher(client,"default","Pod")
-    test_watcher(client,"default","Service")
-    test_watcher(client,"default","Deployment")
-    test_watcher(client,"default","APIService")
+    test_watcher_base(client,"default","Pod",handlerFunction=deal_watch(),timeoutSeconds=3)
     test_CRUD(client=client)
-    KubernetesClient.joinWatchers()
+
+    print("current thread count: ",KubernetesClient.getWatchThreadCount())
+    time.sleep(7)
+    # because of the timeoutSecond=3, watching thread is leave.
+    print("current thread count: ",KubernetesClient.getWatchThreadCount())
 
 if __name__ == '__main__':
     main()

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='kubesys',
-    version='1.0.6',
+    version='1.0.7',
     keywords='k8s',
     description='a python-based wrapper library for kubernetes-calls',
     author='a_flying_fish',