postgresml · levkk · Oct 3, 2023 · Aug 2, 2023 · Aug 2, 2023 · Aug 2, 2023
diff --git a/src/config.rs b/src/config.rs
@@ -763,15 +763,26 @@ pub struct Plugins {
    pub prewarmer: Option<Prewarmer>,
 }

+pub trait Plugin {
+    fn is_enabled(&self) -> bool;
+}
+
 impl std::fmt::Display for Plugins {
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        fn is_enabled<T: Plugin>(arg: Option<&T>) -> bool {
+            if let Some(ref arg) = arg {
+                arg.is_enabled()
+            } else {
+                false
+            }
+        }
        write!(
            f,
            "interceptor: {}, table_access: {}, query_logger: {}, prewarmer: {}",
-            self.intercept.is_some(),
-            self.table_access.is_some(),
-            self.query_logger.is_some(),
-            self.prewarmer.is_some(),
+            is_enabled(self.intercept.as_ref()),
+            is_enabled(self.table_access.as_ref()),
+            is_enabled(self.query_logger.as_ref()),
+            is_enabled(self.prewarmer.as_ref()),
        )
    }
 }
@@ -782,23 +793,47 @@ pub struct Intercept {
    pub queries: BTreeMap<String, Query>,
 }

+impl Plugin for Intercept {
+    fn is_enabled(&self) -> bool {
+        self.enabled
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, Hash, Eq)]
 pub struct TableAccess {
    pub enabled: bool,
    pub tables: Vec<String>,
 }

+impl Plugin for TableAccess {
+    fn is_enabled(&self) -> bool {
+        self.enabled
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, Hash, Eq)]
 pub struct QueryLogger {
    pub enabled: bool,
 }

+impl Plugin for QueryLogger {
+    fn is_enabled(&self) -> bool {
+        self.enabled
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, Hash, Eq)]
 pub struct Prewarmer {
    pub enabled: bool,
    pub queries: Vec<String>,
 }

+impl Plugin for Prewarmer {
+    fn is_enabled(&self) -> bool {
+        self.enabled
+    }
+}
+
 impl Intercept {
    pub fn substitute(&mut self, db: &str, user: &str) {
        for (_, query) in self.queries.iter_mut() {
-Original file line number
+Diff line change
@@ -763,15 +763,26 @@ pub struct Plugins {
         pub prewarmer: Option<Prewarmer>,
     }
+    pub trait Plugin {
               Copy link

  
        
      
    

    
        

  
    Contributor


        

    
  

  
    
      
          
      

      
            levkk
  

      

      

      


        Oct 3, 2023


      
  •

  
    
      
        
          edited
          
        
        
      
    
    
      
  
        
      Loading


  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  
    
  


    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Nice to have a trait, but don't think you need it for this particular fix. We should discuss what trait we should have for a Plugin to implement, so we can get on our way to a real plugin system.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



    
        
  
    
      
          
    
  


        
            
  
      
              Copy link

  
        
      
    

    
        

  
    Contributor


        

    
  

  
    
      
          
      

      
            levkk
  

      

      

      


        Oct 3, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Second thought I see why you added it here.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
            mdashti reacted with thumbs up emoji
      
        
            
    All reactions
  


          
              
                👍
                  1 reaction
              
          
        
      
    

    



    
        
  
    
      
          
    
  


        
            
  
      
              Copy link

  
        
      
    

    
        

  
    Contributor


        

  Author


    
  

  
    
      
          
      

      
            mdashti
  

      

      

      


        Oct 3, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I'm also thinking about the plugin system. I should write down my thoughts and share it with you. Please do the same if you have such notes.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+        fn is_enabled(&self) -> bool;
+    }
     impl std::fmt::Display for Plugins {
         fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+            fn is_enabled<T: Plugin>(arg: Option<&T>) -> bool {
               Copy link

  
        
      
    

    
        

  
    Contributor


        

    
  

  
    
      
          
      

      
            levkk
  

      

      

      


        Oct 3, 2023


      
  •

  
    
      
        
          edited
          
        
        
      
    
    
      
  
        
      Loading


  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  
    
  


    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Cleaner and safer to write it this way:
if let Some(arg) = arg {
    arg.is_enabled()
} else {
    false
}
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



    
        
  
    
      
          
    
  


        
            
  
      
              Copy link

  
        
      
    

    
        

  
    Contributor


        

  Author


    
  

  
    
      
          
      

      
            mdashti
  

      

      

      


        Oct 3, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      That's a valid suggestion. Thanks. Done.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+                if let Some(ref arg) = arg {
+                    arg.is_enabled()
+                } else {
+                    false
+                }
+            }
             write!(
                 f,
                 "interceptor: {}, table_access: {}, query_logger: {}, prewarmer: {}",
-                self.intercept.is_some(),
-                self.table_access.is_some(),
-                self.query_logger.is_some(),
-                self.prewarmer.is_some(),
+                is_enabled(self.intercept.as_ref()),
+                is_enabled(self.table_access.as_ref()),
+                is_enabled(self.query_logger.as_ref()),
+                is_enabled(self.prewarmer.as_ref()),
             )
         }
     }
@@ -782,23 +793,47 @@ pub struct Intercept {
         pub queries: BTreeMap<String, Query>,
     }
+    impl Plugin for Intercept {
+        fn is_enabled(&self) -> bool {
+            self.enabled
+        }
+    }
     #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, Hash, Eq)]
     pub struct TableAccess {
         pub enabled: bool,
         pub tables: Vec<String>,
     }
+    impl Plugin for TableAccess {
+        fn is_enabled(&self) -> bool {
+            self.enabled
+        }
+    }
     #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, Hash, Eq)]
     pub struct QueryLogger {
         pub enabled: bool,
     }
+    impl Plugin for QueryLogger {
+        fn is_enabled(&self) -> bool {
+            self.enabled
+        }
+    }
     #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, Hash, Eq)]
     pub struct Prewarmer {
         pub enabled: bool,
         pub queries: Vec<String>,
     }
+    impl Plugin for Prewarmer {
+        fn is_enabled(&self) -> bool {
+            self.enabled
+        }
+    }
     impl Intercept {
         pub fn substitute(&mut self, db: &str, user: &str) {
             for (_, query) in self.queries.iter_mut() {
-          Expand Down